Author: jbonofre
Date: Mon Sep 20 10:28:38 2010
New Revision: 998875
URL: http://svn.apache.org/viewvc?rev=998875&view=rev
Log:
[SMXCOMP-804] servicemix-vfs component throws a NullPointerException with
tmpName is not set in the message.
Modified:
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/FileObjectResolver.java
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
Modified:
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/FileObjectResolver.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/FileObjectResolver.java?rev=998875&r1=998874&r2=998875&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/FileObjectResolver.java
(original)
+++
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/FileObjectResolver.java
Mon Sep 20 10:28:38 2010
@@ -59,11 +59,11 @@ public class FileObjectResolver {
answer.createFolder();
}
catch (FileSystemException e) {
- throw new IOException("Failed to create folder: " + e);
+ throw new IOException("Failed to create folder.", e);
}
}
catch (FileSystemException e) {
- throw new IOException("Failed to initialize file system manager: "
+ e);
+ throw new IOException("Failed to initialize file system manager.",
e);
}
return answer;
Modified:
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java?rev=998875&r1=998874&r2=998875&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
(original)
+++
servicemix/components/bindings/servicemix-vfs/trunk/src/main/java/org/apache/servicemix/vfs/VFSSendingEndpoint.java
Mon Sep 20 10:28:38 2010
@@ -106,7 +106,7 @@ public class VFSSendingEndpoint extends
logger.error("Caught exception while closing stream on
error: " + e, e);
}
}
- if (name != null && !name.equals(tmpName)) {
+ if (tmpName != null && name != null && !name.equals(tmpName)) {
if (!tmpFile.canRenameTo(newFile)) {
throw new IOException("File " + tmpName + " could not
be renamed to " + name);
} else {
