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 2016/04/28 09:11:07 UTC
[1/4] camel git commit: Fix checkstyle issues
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 7a72ca610 -> 415868644
refs/heads/master e9b01196a -> 773547a2e
Fix checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/773547a2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/773547a2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/773547a2
Branch: refs/heads/master
Commit: 773547a2e0890794fe04c0412f4b37d0c64b2fa4
Parents: 8d64898
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Wed Apr 27 13:24:53 2016 -0600
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 09:09:14 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/773547a2/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 7a95dc2..f1fa9b7 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -205,9 +205,9 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
Socket socket = null;
try {
socket = serverSocket.accept();
- } catch (SocketTimeoutException timeoutEx ) {
+ } catch (SocketTimeoutException timeoutEx) {
// Didn't get a new connection - keep waiting for one
- log.debug( "Timeout waiting for client connection - keep listening");
+ log.debug("Timeout waiting for client connection - keep listening");
continue;
} catch (SocketException socketEx) {
// This should happen if the component is closed while the accept call is blocking
[4/4] camel git commit: Fix checkstyle issues
Posted by da...@apache.org.
Fix checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/41586864
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/41586864
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/41586864
Branch: refs/heads/camel-2.17.x
Commit: 41586864490dbe56b4c167413a24a2d48b4cccdd
Parents: 389e977
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Wed Apr 27 13:24:53 2016 -0600
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 09:10:59 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/41586864/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 7a95dc2..f1fa9b7 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -205,9 +205,9 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
Socket socket = null;
try {
socket = serverSocket.accept();
- } catch (SocketTimeoutException timeoutEx ) {
+ } catch (SocketTimeoutException timeoutEx) {
// Didn't get a new connection - keep waiting for one
- log.debug( "Timeout waiting for client connection - keep listening");
+ log.debug("Timeout waiting for client connection - keep listening");
continue;
} catch (SocketException socketEx) {
// This should happen if the component is closed while the accept call is blocking
[2/4] camel git commit: CAMEL-9920 - Handle SocketTimeoutException on
accept
Posted by da...@apache.org.
CAMEL-9920 - Handle SocketTimeoutException on accept
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8d648983
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8d648983
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8d648983
Branch: refs/heads/master
Commit: 8d64898311b808bda25f164594a3a97237957bb0
Parents: e9b0119
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Wed Apr 27 13:11:23 2016 -0600
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 09:09:14 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8d648983/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index c025f80..7a95dc2 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -205,6 +205,10 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
Socket socket = null;
try {
socket = serverSocket.accept();
+ } catch (SocketTimeoutException timeoutEx ) {
+ // Didn't get a new connection - keep waiting for one
+ log.debug( "Timeout waiting for client connection - keep listening");
+ continue;
} catch (SocketException socketEx) {
// This should happen if the component is closed while the accept call is blocking
if (serverSocket.isBound()) {
[3/4] camel git commit: CAMEL-9920 - Handle SocketTimeoutException on
accept
Posted by da...@apache.org.
CAMEL-9920 - Handle SocketTimeoutException on accept
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/389e9770
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/389e9770
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/389e9770
Branch: refs/heads/camel-2.17.x
Commit: 389e977098bf8106f9ead5e4e379e91d625a47e5
Parents: 7a72ca6
Author: Quinn Stevenson <qu...@pronoia-solutions.com>
Authored: Wed Apr 27 13:11:23 2016 -0600
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 28 09:10:52 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/mllp/MllpTcpServerConsumer.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/389e9770/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index c025f80..7a95dc2 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -205,6 +205,10 @@ public class MllpTcpServerConsumer extends DefaultConsumer {
Socket socket = null;
try {
socket = serverSocket.accept();
+ } catch (SocketTimeoutException timeoutEx ) {
+ // Didn't get a new connection - keep waiting for one
+ log.debug( "Timeout waiting for client connection - keep listening");
+ continue;
} catch (SocketException socketEx) {
// This should happen if the component is closed while the accept call is blocking
if (serverSocket.isBound()) {