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 2015/07/07 14:24:21 UTC

[1/2] camel git commit: CAMEL-8919: Fixed udp multicast on windows. Thanks to Darshan Sundaresh for the patch.

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x 86919b063 -> 45502152e
  refs/heads/master 1d5b53d22 -> 8d6e1032c


CAMEL-8919: Fixed udp multicast on windows. Thanks to Darshan Sundaresh for the patch.


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

Branch: refs/heads/master
Commit: 8d6e1032c66f6dac0f22efd2c0f94384414d8688
Parents: 1d5b53d
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 7 14:22:34 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 7 14:28:42 2015 +0200

----------------------------------------------------------------------
 .../component/netty4/SingleUDPNettyServerBootstrapFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8d6e1032/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
index a545002..13d2166 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
@@ -161,7 +161,7 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme
         SubnetUtils multicastSubnet = new SubnetUtils(MULTICAST_SUBNET);
 
         if (multicastSubnet.getInfo().isInRange(configuration.getHost())) {
-            ChannelFuture channelFuture = bootstrap.bind(hostAddress);
+            ChannelFuture channelFuture = bootstrap.bind(configuration.getPort());
             channelFuture.awaitUninterruptibly();
             channel = channelFuture.channel();
             DatagramChannel datagramChannel = (DatagramChannel) channel;


[2/2] camel git commit: CAMEL-8919: Fixed udp multicast on windows. Thanks to Darshan Sundaresh for the patch.

Posted by da...@apache.org.
CAMEL-8919: Fixed udp multicast on windows. Thanks to Darshan Sundaresh for the patch.


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

Branch: refs/heads/camel-2.15.x
Commit: 45502152e6892d74453e8ee36a62ddabaf452522
Parents: 86919b0
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 7 14:22:34 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 7 14:30:31 2015 +0200

----------------------------------------------------------------------
 .../component/netty4/SingleUDPNettyServerBootstrapFactory.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/45502152/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
index a545002..13d2166 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
@@ -161,7 +161,7 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme
         SubnetUtils multicastSubnet = new SubnetUtils(MULTICAST_SUBNET);
 
         if (multicastSubnet.getInfo().isInRange(configuration.getHost())) {
-            ChannelFuture channelFuture = bootstrap.bind(hostAddress);
+            ChannelFuture channelFuture = bootstrap.bind(configuration.getPort());
             channelFuture.awaitUninterruptibly();
             channel = channelFuture.channel();
             DatagramChannel datagramChannel = (DatagramChannel) channel;