svn commit: r751611 - /servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java

[lh...@apache.org]

Author: lhein
Date: Mon Mar  9 08:07:03 2009
New Revision: 751611

URL: http://svn.apache.org/viewvc?rev=751611&view=rev
Log:
reverted the changes for SMXCOMP-55 because they broke the servicemix-file bc being unable to write a file with it's original name at all

Modified:
    servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java

Modified: servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java?rev=751611&r1=751610&r2=751611&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java (original)
+++ servicemix/components/bindings/servicemix-file/trunk/src/main/java/org/apache/servicemix/file/FileSenderEndpoint.java Mon Mar  9 08:07:03 2009
@@ -64,24 +64,16 @@
         }
     }
     
-    protected String getFileName(String name) {
-        String result = tempFilePrefix == null ? name : tempFilePrefix + name;
-        result = tempFileSuffix == null ? result : result + tempFileSuffix;
-        return result;
-    }
-
     protected void processInOnly(MessageExchange exchange, NormalizedMessage in) throws Exception {
         OutputStream out = null;
         File newFile = null;
-        String fileName = null;
         boolean success = false;
         try {
             String name = marshaler.getOutputName(exchange, in);
             if (name == null) {
                 newFile = File.createTempFile(tempFilePrefix, tempFileSuffix, directory);
             } else {
-                fileName = this.getFileName(name);
-                newFile = new File(directory, fileName);
+                newFile = new File(directory, name);
             }
             if (!newFile.getParentFile().exists() && isAutoCreateDirectory()) {
                 newFile.getParentFile().mkdirs();