You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/01/18 08:42:30 UTC
[01/10] camel git commit: Polished
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 7777d3ad8 -> 4b1aafcc5
refs/heads/camel-2.18.x 489d21f9d -> 2e020ea2e
refs/heads/master fdcd05b26 -> 1e7bdeed2
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e7bdeed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e7bdeed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e7bdeed
Branch: refs/heads/master
Commit: 1e7bdeed2a4362ad2087999ba8dc9865f697b340
Parents: 69b5cdf
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jan 18 09:22:18 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:24:03 2017 +0100
----------------------------------------------------------------------
.../impl/ThrottlingExceptionRoutePolicy.java | 38 +++++++++-----------
1 file changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1e7bdeed/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
index cda8018..aaa4eca 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/ThrottlingExceptionRoutePolicy.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
* There are two ways to determine if a route can be closed after being opened
* (1) start the consumer and check the failure threshold
* (2) call the {@link ThrottlingExceptionHalfOpenHandler}
- * The second option allows a custom check to be performed without having to take on the possibiliy of
+ * The second option allows a custom check to be performed without having to take on the possibility of
* multiple messages from the endpoint. The idea is that a handler could run a simple test (ie select 1 from dual)
* to determine if the processes that cause the route to be open are now available
*/
@@ -71,11 +71,11 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
private ThrottlingExceptionHalfOpenHandler halfOpenHandler;
// stateful information
- private Timer halfOpenTimer;
- private AtomicInteger failures = new AtomicInteger();
- private AtomicInteger state = new AtomicInteger(STATE_CLOSED);
- private long lastFailure;
- private long openedAt;
+ private final AtomicInteger failures = new AtomicInteger();
+ private final AtomicInteger state = new AtomicInteger(STATE_CLOSED);
+ private volatile Timer halfOpenTimer;
+ private volatile long lastFailure;
+ private volatile long openedAt;
public ThrottlingExceptionRoutePolicy(int threshold, long failureWindow, long halfOpenAfter, List<Class<?>> handledExceptions) {
this.throttledExceptions = handledExceptions;
@@ -96,7 +96,7 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
@Override
public void onInit(Route route) {
- LOG.debug("initializing ThrottlingExceptionRoutePolicy route policy...");
+ LOG.debug("Initializing ThrottlingExceptionRoutePolicy route policy...");
logState();
}
@@ -116,8 +116,6 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
* uses similar approach as {@link CircuitBreakerLoadBalancer}
* if the exchange has an exception that we are watching
* then we count that as a failure otherwise we ignore it
- * @param exchange
- * @return
*/
private boolean hasFailed(Exchange exchange) {
if (exchange == null) {
@@ -127,7 +125,6 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
boolean answer = false;
if (exchange.getException() != null) {
- LOG.debug("exception occured on route: checking to see if I handle that");
if (throttledExceptions == null || throttledExceptions.isEmpty()) {
// if no exceptions defined then always fail
// (ie) assume we throttle on all exceptions
@@ -157,31 +154,31 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
if (state.get() == STATE_CLOSED) {
if (failureLimitReached) {
- LOG.debug("opening circuit...");
+ LOG.debug("Opening circuit...");
openCircuit(route);
}
} else if (state.get() == STATE_HALF_OPEN) {
if (failureLimitReached) {
- LOG.debug("opening circuit...");
+ LOG.debug("Opening circuit...");
openCircuit(route);
} else {
- LOG.debug("closing circuit...");
+ LOG.debug("Closing circuit...");
closeCircuit(route);
}
} else if (state.get() == STATE_OPEN) {
long elapsedTimeSinceOpened = System.currentTimeMillis() - openedAt;
if (halfOpenAfter <= elapsedTimeSinceOpened) {
- LOG.debug("checking an open circuit...");
+ LOG.debug("Checking an open circuit...");
if (halfOpenHandler != null) {
if (halfOpenHandler.isReadyToBeClosed()) {
- LOG.debug("closing circuit...");
+ LOG.debug("Closing circuit...");
closeCircuit(route);
} else {
- LOG.debug("opening circuit...");
+ LOG.debug("Opening circuit...");
openCircuit(route);
}
} else {
- LOG.debug("half opening circuit...");
+ LOG.debug("Half opening circuit...");
halfOpenCircuit(route);
}
}
@@ -243,9 +240,6 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
}
}
- /**
- * reset the route
- */
private void reset() {
failures.set(0);
lastFailure = 0;
@@ -263,9 +257,9 @@ public class ThrottlingExceptionRoutePolicy extends RoutePolicySupport implement
int num = state.get();
String state = stateAsString(num);
if (failures.get() > 0) {
- return String.format("*** State %s, failures %d, last failure %d ms ago", state, failures.get(), System.currentTimeMillis() - lastFailure);
+ return String.format("State %s, failures %d, last failure %d ms ago", state, failures.get(), System.currentTimeMillis() - lastFailure);
} else {
- return String.format("*** State %s, failures %d", state, failures.get());
+ return String.format("State %s, failures %d", state, failures.get());
}
}
[06/10] camel git commit: Indentation fix
Posted by da...@apache.org.
Indentation fix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/578f26b4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/578f26b4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/578f26b4
Branch: refs/heads/camel-2.18.x
Commit: 578f26b40b24dfecb091234a860c981c2849bc7f
Parents: 045aa57
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Wed Jan 18 08:12:14 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:41:31 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/scp/ScpOperations.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/578f26b4/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index 243316b..3e5261a 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -337,11 +337,11 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
String message;
int answer = is.read();
switch (answer) {
- case 0:
- break;
- default:
- message = "[scp] Return Code [" + answer + "]" + readLine(is);
- throw new IOException(message);
+ case 0:
+ break;
+ default:
+ message = "[scp] Return Code [" + answer + "] " + readLine(is);
+ throw new IOException(message);
}
return answer;
}
@@ -438,4 +438,4 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
return null;
}
}
-}
+}
\ No newline at end of file
[08/10] camel git commit: CAMEL-10713 SCP not handling errors for
failed transfers correctly
Posted by da...@apache.org.
CAMEL-10713 SCP not handling errors for failed transfers correctly
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/603c3f37
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/603c3f37
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/603c3f37
Branch: refs/heads/camel-2.17.x
Commit: 603c3f3789bce23d03180535908184f4a18b6070
Parents: 7777d3ad
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Tue Jan 17 22:24:48 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:42:03 2017 +0100
----------------------------------------------------------------------
.../camel/component/scp/ScpOperations.java | 31 +++++++-------------
1 file changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/603c3f37/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index 32afcbb..39dabc3 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -284,7 +284,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
writeFile(filename.substring(pos + 1), data, os, is, cfg);
@@ -293,7 +293,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
} else {
int count = 0;
int read;
@@ -314,7 +314,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
// now send the stream
buffer.reset();
@@ -322,7 +322,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(reply, 0, read);
}
writeAck(os);
- readAck(is, false);
+ readAck(is);
} finally {
IOHelper.close(buffer);
}
@@ -334,26 +334,15 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.flush();
}
- private int readAck(InputStream is, boolean failOnEof) throws IOException {
+ private int readAck(InputStream is) throws IOException {
String message;
int answer = is.read();
switch (answer) {
- case -1:
- if (failOnEof) {
- message = "[scp] Unexpected end of stream";
- throw new EOFException(message);
- }
- break;
- case 1:
- message = "[scp] WARN " + readLine(is);
- LOG.warn(message);
- break;
- case 2:
- message = "[scp] NACK " + readLine(is);
- throw new IOException(message);
- default:
- // case 0:
- break;
+ case 0:
+ break;
+ default:
+ message = "[scp] Return Code [" + answer + "]" + readLine(is);
+ throw new IOException(message);
}
return answer;
}
[05/10] camel git commit: CAMEL-10713 SCP not handling errors for
failed transfers correctly
Posted by da...@apache.org.
CAMEL-10713 SCP not handling errors for failed transfers correctly
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/045aa57b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/045aa57b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/045aa57b
Branch: refs/heads/camel-2.18.x
Commit: 045aa57b9f519f86292b53efe7c3e8beb347385c
Parents: 489d21f
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Tue Jan 17 22:24:48 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:41:20 2017 +0100
----------------------------------------------------------------------
.../camel/component/scp/ScpOperations.java | 31 +++++++-------------
1 file changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/045aa57b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index fb5e34f..243316b 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -283,7 +283,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
writeFile(filename.substring(pos + 1), data, os, is, cfg);
@@ -292,7 +292,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
} else {
int count = 0;
int read;
@@ -313,7 +313,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
// now send the stream
buffer.reset();
@@ -321,7 +321,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(reply, 0, read);
}
writeAck(os);
- readAck(is, false);
+ readAck(is);
} finally {
IOHelper.close(buffer);
}
@@ -333,26 +333,15 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.flush();
}
- private int readAck(InputStream is, boolean failOnEof) throws IOException {
+ private int readAck(InputStream is) throws IOException {
String message;
int answer = is.read();
switch (answer) {
- case -1:
- if (failOnEof) {
- message = "[scp] Unexpected end of stream";
- throw new EOFException(message);
- }
- break;
- case 1:
- message = "[scp] WARN " + readLine(is);
- LOG.warn(message);
- break;
- case 2:
- message = "[scp] NACK " + readLine(is);
- throw new IOException(message);
- default:
- // case 0:
- break;
+ case 0:
+ break;
+ default:
+ message = "[scp] Return Code [" + answer + "]" + readLine(is);
+ throw new IOException(message);
}
return answer;
}
[03/10] camel git commit: CAMEL-10713 SCP not handling errors for
failed transfers correctly
Posted by da...@apache.org.
CAMEL-10713 SCP not handling errors for failed transfers correctly
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3734bc8a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3734bc8a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3734bc8a
Branch: refs/heads/master
Commit: 3734bc8add7bef84b0782bdd11c5f8e359984a60
Parents: fdcd05b
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Tue Jan 17 22:24:48 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:24:03 2017 +0100
----------------------------------------------------------------------
.../camel/component/scp/ScpOperations.java | 31 +++++++-------------
1 file changed, 10 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3734bc8a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index 1403dae..9468c15 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -288,7 +288,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
writeFile(filename.substring(pos + 1), data, os, is, cfg);
@@ -297,7 +297,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
} else {
int count = 0;
int read;
@@ -318,7 +318,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(bytes.getBytes());
os.write(lineFeed);
os.flush();
- readAck(is, false);
+ readAck(is);
// now send the stream
buffer.reset();
@@ -326,7 +326,7 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.write(reply, 0, read);
}
writeAck(os);
- readAck(is, false);
+ readAck(is);
} finally {
IOHelper.close(buffer);
}
@@ -338,26 +338,15 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
os.flush();
}
- private int readAck(InputStream is, boolean failOnEof) throws IOException {
+ private int readAck(InputStream is) throws IOException {
String message;
int answer = is.read();
switch (answer) {
- case -1:
- if (failOnEof) {
- message = "[scp] Unexpected end of stream";
- throw new EOFException(message);
- }
- break;
- case 1:
- message = "[scp] WARN " + readLine(is);
- LOG.warn(message);
- break;
- case 2:
- message = "[scp] NACK " + readLine(is);
- throw new IOException(message);
- default:
- // case 0:
- break;
+ case 0:
+ break;
+ default:
+ message = "[scp] Return Code [" + answer + "]" + readLine(is);
+ throw new IOException(message);
}
return answer;
}
[04/10] camel git commit: Indentation fix
Posted by da...@apache.org.
Indentation fix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e6c623be
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e6c623be
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e6c623be
Branch: refs/heads/master
Commit: e6c623be10dd02e03dad4be0abce5c0da6561f56
Parents: 3734bc8
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Wed Jan 18 08:12:14 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:24:03 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/scp/ScpOperations.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e6c623be/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index 9468c15..a0dd10f 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -342,11 +342,11 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
String message;
int answer = is.read();
switch (answer) {
- case 0:
- break;
- default:
- message = "[scp] Return Code [" + answer + "]" + readLine(is);
- throw new IOException(message);
+ case 0:
+ break;
+ default:
+ message = "[scp] Return Code [" + answer + "] " + readLine(is);
+ throw new IOException(message);
}
return answer;
}
@@ -443,4 +443,4 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
return null;
}
}
-}
+}
\ No newline at end of file
[10/10] camel git commit: Newline at end of file
Posted by da...@apache.org.
Newline at end of file
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b1aafcc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b1aafcc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b1aafcc
Branch: refs/heads/camel-2.17.x
Commit: 4b1aafcc5a89ec88c1fd9e1e3454dd86014b21c2
Parents: 5136cf5
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Wed Jan 18 08:14:32 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:42:21 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/scp/ScpOperations.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4b1aafcc/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index bf38d3c..65469e0 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -439,4 +439,4 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
return null;
}
}
-}
\ No newline at end of file
+}
[09/10] camel git commit: Indentation fix
Posted by da...@apache.org.
Indentation fix
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5136cf53
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5136cf53
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5136cf53
Branch: refs/heads/camel-2.17.x
Commit: 5136cf532d9c62c26b596808c1c5d3c1733250e4
Parents: 603c3f3
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Wed Jan 18 08:12:14 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:42:11 2017 +0100
----------------------------------------------------------------------
.../org/apache/camel/component/scp/ScpOperations.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5136cf53/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index 39dabc3..bf38d3c 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -338,11 +338,11 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
String message;
int answer = is.read();
switch (answer) {
- case 0:
- break;
- default:
- message = "[scp] Return Code [" + answer + "]" + readLine(is);
- throw new IOException(message);
+ case 0:
+ break;
+ default:
+ message = "[scp] Return Code [" + answer + "] " + readLine(is);
+ throw new IOException(message);
}
return answer;
}
@@ -439,4 +439,4 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
return null;
}
}
-}
+}
\ No newline at end of file
[07/10] camel git commit: Newline at end of file
Posted by da...@apache.org.
Newline at end of file
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e020ea2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e020ea2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e020ea2
Branch: refs/heads/camel-2.18.x
Commit: 2e020ea2e7ba9e6f0a7c3facb6378e5267f65480
Parents: 578f26b
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Wed Jan 18 08:14:32 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:41:38 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/scp/ScpOperations.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2e020ea2/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index 3e5261a..ad06947 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -438,4 +438,4 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
return null;
}
}
-}
\ No newline at end of file
+}
[02/10] camel git commit: Newline at end of file
Posted by da...@apache.org.
Newline at end of file
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/69b5cdf4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/69b5cdf4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/69b5cdf4
Branch: refs/heads/master
Commit: 69b5cdf4e401b4c33891a573e89d291433f02d2b
Parents: e6c623b
Author: Patrick McGloin <pa...@Patricks-MacBook-Air.local>
Authored: Wed Jan 18 08:14:32 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jan 18 09:24:03 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/scp/ScpOperations.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/69b5cdf4/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
----------------------------------------------------------------------
diff --git a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
index a0dd10f..e45a20e 100644
--- a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
+++ b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpOperations.java
@@ -443,4 +443,4 @@ public class ScpOperations implements RemoteFileOperations<ScpFile> {
return null;
}
}
-}
\ No newline at end of file
+}