svn commit: r582204 - /incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java

[gertv]

Author: gertv
Date: Fri Oct  5 03:55:22 2007
New Revision: 582204

URL: http://svn.apache.org/viewvc?rev=582204&view=rev
Log:
Fix for SM-1093: NPE in FTP sender

Modified:
    
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java

Modified: 
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java
URL: 
http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java?rev=582204&r1=582203&r2=582204&view=diff
==============================================================================
--- 
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java
 (original)
+++ 
incubator/servicemix/branches/servicemix-3.1/deployables/bindingcomponents/servicemix-ftp/src/main/java/org/apache/servicemix/ftp/FtpSenderEndpoint.java
 Fri Oct  5 03:55:22 2007
@@ -163,17 +163,17 @@
                 throw new IOException("No output stream available for output 
name: " + name + ". Maybe the file already exists?");
             }
             marshaler.writeMessage(exchange, message, out, name);
-        }
+        } 
         finally {
             if (out != null) {
                 try {
                     out.close();
+                    client.completePendingCommand();
                 }
                 catch (IOException e) {
                     logger.error("Caught exception while closing stream on 
error: " + e, e);
                 }
             }
-            client.completePendingCommand();
             returnClient(client);
         }
     }