You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/30 05:20:45 UTC

[1/2] camel git commit: CAMEL-8718 Fixed the build error in camel-ftp

Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x aef88ab1c -> 2f175cb68


CAMEL-8718 Fixed the build error in camel-ftp


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/283a5263
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/283a5263
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/283a5263

Branch: refs/heads/camel-2.14.x
Commit: 283a52630764bd6643ba02a177bca4ff9a159522
Parents: aef88ab
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Apr 30 10:42:52 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Apr 30 10:42:52 2015 +0800

----------------------------------------------------------------------
 .../camel/component/file/remote/FtpBadLoginConnectionLeakTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/283a5263/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
----------------------------------------------------------------------
diff --git a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
index 54b1574..18eb877 100644
--- a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
+++ b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
@@ -42,7 +42,7 @@ public class FtpBadLoginConnectionLeakTest extends FtpServerTestSupport {
     /**
      * Mapping of socket hashcode to two element tab ([connect() called, close() called])
      */
-    private Map<Integer, boolean[]> socketAudits = new HashMap<>();
+    private Map<Integer, boolean[]> socketAudits = new HashMap<Integer, boolean[]>();
 
     @Override

[2/2] camel git commit: CAMEL-8702 Fixed the test error of camel-netty4

Posted by ni...@apache.org.
CAMEL-8702 Fixed the test error of camel-netty4


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f175cb6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f175cb6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f175cb6

Branch: refs/heads/camel-2.14.x
Commit: 2f175cb68792c501ddad410cef9113c5c99c8abb
Parents: 283a526
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Apr 30 10:44:48 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Thu Apr 30 10:44:48 2015 +0800

----------------------------------------------------------------------
 .../netty4/NettyServerBootstrapConfiguration.java         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/2f175cb6/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
index a071535..9436a38 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyServerBootstrapConfiguration.java
@@ -57,12 +57,10 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
     protected String securityProvider;
     protected String enabledProtocols = defaultEnabledProtocols;
     protected String passphrase;
-    @UriParam
     protected EventLoopGroup bossGroup;
-    @UriParam
     protected EventLoopGroup workerGroup;
     protected String networkInterface;
-    
+
     // setup the default value of TLS
     static {
         // JDK6 doesn't support TLSv1.1,TLSv1.2
@@ -323,19 +321,19 @@ public class NettyServerBootstrapConfiguration implements Cloneable {
     }
 
     /**
-     * Set the BossGroup which could be used for handling the new connection of the server side across the NettyEndpoint 
+     * Set the BossGroup which could be used for handling the new connection of the server side across the NettyEndpoint
      * @param bossGroup
      */
     public void setBossGroup(EventLoopGroup bossGroup) {
         this.bossGroup = bossGroup;
     }
-    
+
     public EventLoopGroup getWorkerGroup() {
         return workerGroup;
     }
 
     /**
-     * Set the WorkerGroup which could be used for handling selector eventloop across the NettyEndpoint 
+     * Set the WorkerGroup which could be used for handling selector eventloop across the NettyEndpoint
      * @param workerGroup
      */
     public void setWorkerGroup(EventLoopGroup workerGroup) {