Merge branch 'hotfix/admin_nullpoint'

wuwen5 · Nov 21, 2014 · 32c9f84 · 32c9f84
2 parents 345b228 + 604a840
commit 32c9f84
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/dubbo-admin/src/main/java/com/alibaba/dubbo/governance/service/impl/ConsumerServiceImpl.java b/dubbo-admin/src/main/java/com/alibaba/dubbo/governance/service/impl/ConsumerServiceImpl.java
@@ -76,6 +76,8 @@ public List<String> findAddresses() {
     public List<String> findAddressesByApplication(String application) {
         List<String> ret = new ArrayList<String>();
         ConcurrentMap<String, Map<Long, URL>> consumerUrls = getRegistryCache().get(Constants.CONSUMERS_CATEGORY);
+        if(consumerUrls == null) return ret;
+
         for(Map.Entry<String, Map<Long, URL>> e1 : consumerUrls.entrySet()) {
             Map<Long, URL> value = e1.getValue();
             for(Map.Entry<Long, URL> e2 : value.entrySet()) {