Author: bfoster
Date: Thu May 15 04:06:53 2014
New Revision: 1594766
URL: http://svn.apache.org/r1594766
Log:
- Rename file before server file is deleted
OODT-695
Modified:
oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
Modified:
oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java?rev=1594766&r1=1594765&r2=1594766&view=diff
==============================================================================
---
oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
(original)
+++
oodt/trunk/pushpull/src/main/java/org/apache/oodt/cas/pushpull/protocol/ProtocolHandler.java
Thu May 15 04:06:53 2014
@@ -253,6 +253,9 @@ public class ProtocolHandler {
// try to download the file
protocol.get(fromFile, downloadFile);
+ // rename file back to original name
+ downloadFile.renameTo(toFile);
+
// delete file is specified
if (delete) {
if (!this.delete(protocol, fromFile))
@@ -265,9 +268,6 @@ public class ProtocolHandler {
LOG.log(Level.INFO, "Finished downloading " + fromFile + " to " +
toFile);
- // rename file back to original name
- downloadFile.renameTo(toFile);
-
} catch (Exception e) {
downloadFile.delete();
throw new RemoteConnectionException("Failed to download file " + fromFile
