Author: rob.stryker(a)jboss.com
Date: 2011-11-30 08:27:33 -0500 (Wed, 30 Nov 2011)
New Revision: 36778
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
Log:
JBIDE-10232 - renameTo error on windows
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-11-30
13:23:11 UTC (rev 36777)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-11-30
13:27:33 UTC (rev 36778)
@@ -241,17 +241,15 @@
InputStream in = new FileInputStream(tempFile);
IStatus status = copyFile(in, file.getPath());
throwOnErrorStatus(file, status);
+ return;
} catch (FileNotFoundException e) {
// shouldn't occur
} finally {
tempFile.delete();
}
- /*if (!safeDelete(file, 8)) {
- tempFile.delete();
- throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, 0,
NLS.bind(Messages.errorDeleting, file.toString()), null));
- }*/
}
}
+ // At this point, the file should be guaranteed not to exist.
if (!safeRename(tempFile, file, 10))
throw new CoreException(new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID,
IEventCodes.JST_PUB_ASSEMBLE_FAIL,
NLS.bind(org.jboss.ide.eclipse.as.core.Messages.PublishRenameFailure,
Show replies by date