You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:49:06 UTC
[36/50] brooklyn-server git commit: Geo info: log and fix NPE
Geo info: log and fix NPE
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b97d6ddb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b97d6ddb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b97d6ddb
Branch: refs/heads/0.4.0
Commit: b97d6ddbf187e61429fee559641e8d9f9ef3d4b9
Parents: 532ade8
Author: Aled Sage <al...@gmail.com>
Authored: Fri Oct 12 15:46:43 2012 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 16 22:22:43 2012 +0100
----------------------------------------------------------------------
core/src/main/java/brooklyn/location/geo/HostGeoInfo.java | 2 +-
.../main/java/brooklyn/location/geo/MaxMindHostGeoLookup.java | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b97d6ddb/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
index c7c4380..b73060f 100644
--- a/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
+++ b/core/src/main/java/brooklyn/location/geo/HostGeoInfo.java
@@ -35,7 +35,7 @@ public class HostGeoInfo {
}
} catch (Exception e) {
if (log.isDebugEnabled())
- log.debug("unable to look up geo DNS info for "+address+": "+e);
+ log.debug("unable to look up geo DNS info for "+address, e);
}
return null;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b97d6ddb/core/src/main/java/brooklyn/location/geo/MaxMindHostGeoLookup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/geo/MaxMindHostGeoLookup.java b/core/src/main/java/brooklyn/location/geo/MaxMindHostGeoLookup.java
index 2c75a33..6e22373 100644
--- a/core/src/main/java/brooklyn/location/geo/MaxMindHostGeoLookup.java
+++ b/core/src/main/java/brooklyn/location/geo/MaxMindHostGeoLookup.java
@@ -45,6 +45,11 @@ public class MaxMindHostGeoLookup implements HostGeoLookup {
if (NetworkUtils.isPrivateSubnet(extAddress)) extAddress = InetAddress.getByName(UtraceHostGeoLookup.getLocalhostExternalIp());
com.maxmind.geoip.Location l = ll.getLocation(extAddress);
+ if (l==null) {
+ if (log.isDebugEnabled()) log.debug("Geo info failed to find location for address {}, using {}", extAddress, ll);
+ return null;
+ }
+
try {
StringBuilder name = new StringBuilder();