You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/12/07 19:51:39 UTC
karaf-cellar git commit: KARAF-4179 - Avoid reverse DNS lookup when
using literal IP address - close #13
Repository: karaf-cellar
Updated Branches:
refs/heads/master c1c2a648e -> b2494af4a
KARAF-4179 - Avoid reverse DNS lookup when using literal IP address - close #13
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/b2494af4
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/b2494af4
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/b2494af4
Branch: refs/heads/master
Commit: b2494af4ac01e914866710d449cc6f4bb682e311
Parents: c1c2a64
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Dec 7 19:49:59 2015 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Dec 7 19:49:59 2015 +0100
----------------------------------------------------------------------
.../cellar/hazelcast/HazelcastClusterManager.java | 6 +++---
.../cellar/hazelcast/HazelcastGroupManager.java | 2 +-
.../cellar/hazelcast/HazelcastInstanceAware.java | 2 +-
.../karaf/cellar/hazelcast/HazelcastNode.java | 16 +++++++++++++---
4 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/b2494af4/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
index 9059eb5..f6bc9b9 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
@@ -87,7 +87,7 @@ public class HazelcastClusterManager extends HazelcastInstanceAware implements C
Set<Member> members = cluster.getMembers();
if (members != null && !members.isEmpty()) {
for (Member member : members) {
- HazelcastNode node = new HazelcastNode(member.getSocketAddress().getHostString(), member.getSocketAddress().getPort());
+ HazelcastNode node = new HazelcastNode(member);
nodes.add(node);
}
}
@@ -110,7 +110,7 @@ public class HazelcastClusterManager extends HazelcastInstanceAware implements C
Set<Member> members = cluster.getMembers();
if (members != null && !members.isEmpty()) {
for (Member member : members) {
- HazelcastNode node = new HazelcastNode(member.getSocketAddress().getHostString(), member.getSocketAddress().getPort());
+ HazelcastNode node = new HazelcastNode(member);
if (ids.contains(node.getId())) {
nodes.add(node);
}
@@ -135,7 +135,7 @@ public class HazelcastClusterManager extends HazelcastInstanceAware implements C
Set<Member> members = cluster.getMembers();
if (members != null && !members.isEmpty()) {
for (Member member : members) {
- HazelcastNode node = new HazelcastNode(member.getSocketAddress().getHostString(), member.getSocketAddress().getPort());
+ HazelcastNode node = new HazelcastNode(member);
if (id.equals(node.getId())) {
return node;
}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/b2494af4/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
index 78370dd..97d5e5c 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastGroupManager.java
@@ -140,7 +140,7 @@ public class HazelcastGroupManager implements GroupManager, EntryListener, Confi
Cluster cluster = instance.getCluster();
if (cluster != null) {
Member member = cluster.getLocalMember();
- node = new HazelcastNode(member.getSocketAddress().getHostString(), member.getSocketAddress().getPort());
+ node = new HazelcastNode(member);
}
return node;
} finally {
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/b2494af4/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java
index 7c9f14d..2e668d4 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastInstanceAware.java
@@ -42,7 +42,7 @@ public class HazelcastInstanceAware {
Cluster cluster = instance.getCluster();
if (cluster != null) {
Member member = cluster.getLocalMember();
- return new HazelcastNode(member.getSocketAddress().getHostString(), member.getSocketAddress().getPort());
+ return new HazelcastNode(member);
} else {
return null;
}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/b2494af4/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
----------------------------------------------------------------------
diff --git a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
index eabd20e..a9bc3ff 100644
--- a/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
+++ b/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastNode.java
@@ -13,8 +13,12 @@
*/
package org.apache.karaf.cellar.hazelcast;
+import com.hazelcast.core.Member;
import org.apache.karaf.cellar.core.Node;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
/**
* Cluster node powered by Hazelcast.
*/
@@ -25,13 +29,19 @@ public class HazelcastNode implements Node {
private String host;
private int port;
- public HazelcastNode(String host, int port) {
+ public HazelcastNode(Member member) {
+ InetSocketAddress address = member.getSocketAddress();
+ this.host = getHostString(address);
+ this.port = address.getPort();
StringBuilder builder = new StringBuilder();
- this.host = host;
- this.port = port;
this.id = builder.append(host).append(":").append(port).toString();
}
+ static String getHostString(InetSocketAddress socketAddress) {
+ InetAddress address = socketAddress.getAddress();
+ return (address != null && address.toString().startsWith("/")) ? address.getHostAddress() : socketAddress.getHostName();
+ }
+
@Override
public String getId() {
return id;