svn commit: r725401 - in /activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote: FtpProducer.java SftpEndpoint.java SftpProducer.java

[davsclaus]

Author: davsclaus
Date: Wed Dec 10 11:42:20 2008
New Revision: 725401

URL: http://svn.apache.org/viewvc?rev=725401&view=rev
Log:
CAMEL-1155: Sorry James my Bad

Modified:
    
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
    
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
    
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpProducer.java

Modified: 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java?rev=725401&r1=725400&r2=725401&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
 Wed Dec 10 11:42:20 2008
@@ -93,7 +93,7 @@
         String target = createFileName(exchange);
 
         // should we write to a temporary name and then afterwards rename to 
real target
-        boolean writeAsTempAndRename = 
ObjectHelper.isNotNullAndNonEmpty(endpoint.getConfiguration().getTempPrefix());
+        boolean writeAsTempAndRename = 
ObjectHelper.isNotEmpty(endpoint.getConfiguration().getTempPrefix());
         String tempTarget = null;
         if (writeAsTempAndRename) {
             // compute temporary name with the temp prefix

Modified: 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java?rev=725401&r1=725400&r2=725401&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
 (original)
+++ 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
 Wed Dec 10 11:42:20 2008
@@ -25,7 +25,7 @@
 import org.apache.camel.Processor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.camel.util.ObjectHelper.isNotNullAndNonEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
 
 public class SftpEndpoint extends RemoteFileEndpoint<RemoteFileExchange> {
     protected final transient Log log = LogFactory.getLog(getClass());
@@ -52,10 +52,10 @@
         final JSch jsch = new JSch();
 
         String privateKeyFile = getConfiguration().getPrivateKeyFile();
-        if (isNotNullAndNonEmpty(privateKeyFile)) {
+        if (isNotEmpty(privateKeyFile)) {
             log.debug("Using private keyfile: " + privateKeyFile);
             String privateKeyFilePassphrase = 
getConfiguration().getPrivateKeyFilePassphrase(); 
-            if (isNotNullAndNonEmpty(privateKeyFilePassphrase)) {
+            if (isNotEmpty(privateKeyFilePassphrase)) {
                 jsch.addIdentity(privateKeyFile, privateKeyFilePassphrase);
             } else {
                 jsch.addIdentity(privateKeyFile);
@@ -63,7 +63,7 @@
         }
 
         String knownHostsFile = getConfiguration().getKnownHosts();
-        if (isNotNullAndNonEmpty(knownHostsFile)) {
+        if (isNotEmpty(knownHostsFile)) {
             log.debug("Using knownHosts: " + knownHostsFile);
             jsch.setKnownHosts(knownHostsFile);
         }

Modified: 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpProducer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpProducer.java?rev=725401&r1=725400&r2=725401&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpProducer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpProducer.java
 Wed Dec 10 11:42:20 2008
@@ -92,7 +92,7 @@
         String target = createFileName(exchange);
 
         // should we write to a temporary name and then afterwards rename to 
real target
-        boolean writeAsTempAndRename = 
ObjectHelper.isNotNullAndNonEmpty(endpoint.getConfiguration().getTempPrefix());
+        boolean writeAsTempAndRename = 
ObjectHelper.isNotEmpty(endpoint.getConfiguration().getTempPrefix());
         String tempTarget = null;
         if (writeAsTempAndRename) {
             // compute temporary name with the temp prefix