You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/06/19 22:19:40 UTC
svn commit: r1351836 - in
/camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch:
ScpOperations.java ScpProducer.java
Author: hadrian
Date: Tue Jun 19 20:19:39 2012
New Revision: 1351836
URL: http://svn.apache.org/viewvc?rev=1351836&view=rev
Log:
CAMEL-5242. Minor fixes
Modified:
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java
Modified: camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java?rev=1351836&r1=1351835&r2=1351836&view=diff
==============================================================================
--- camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java (original)
+++ camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpOperations.java Tue Jun 19 20:19:39 2012
@@ -201,11 +201,8 @@ public class ScpOperations implements Re
}
if (ObjectHelper.isNotEmpty(config.getPrivateKeyFile())) {
LOG.debug("Using private keyfile: {}", config.getPrivateKeyFile());
- if (ObjectHelper.isNotEmpty(config.getPrivateKeyFilePassphrase())) {
- jsch.addIdentity(config.getPrivateKeyFile(), config.getPrivateKeyFilePassphrase());
- } else {
- jsch.addIdentity(config.getPrivateKeyFile());
- }
+ String pkfp = config.getPrivateKeyFilePassphrase();
+ jsch.addIdentity(config.getPrivateKeyFile(), ObjectHelper.isNotEmpty(pkfp) ? pkfp : null);
}
String knownHostsFile = config.getKnownHostsFile();
Modified: camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java?rev=1351836&r1=1351835&r2=1351836&view=diff
==============================================================================
--- camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java (original)
+++ camel/trunk/components/camel-jsch/src/main/java/org/apache/camel/component/jsch/ScpProducer.java Tue Jun 19 20:19:39 2012
@@ -16,13 +16,12 @@
*/
package org.apache.camel.component.jsch;
-import org.apache.camel.component.file.remote.RemoteFileEndpoint;
import org.apache.camel.component.file.remote.RemoteFileOperations;
import org.apache.camel.component.file.remote.RemoteFileProducer;
public class ScpProducer extends RemoteFileProducer<ScpFile> {
- protected ScpProducer(RemoteFileEndpoint<ScpFile> endpoint, RemoteFileOperations<ScpFile> operations) {
+ protected ScpProducer(ScpEndpoint endpoint, RemoteFileOperations<ScpFile> operations) {
super(endpoint, operations);
}
}