commit e062b69257df83bb611b32a9daac1345b25d1e40
author oldrat <oldratlee@gmail.com> Sun Sep 02 23:29:22 2012 +0800
committer oldrat <oldratlee@gmail.com> Sun Sep 02 23:29:22 2012 +0800
tree 2ea09d31fcb2a23fa215d670db83eae89f39a8cf
parent dad4a2a6cf216a6e0db9360ac8c38a7b44d805c6
parent e3af61e5a97260f24e331784d85582fba5b096b0

Merge remote-tracking branch 'origin/dubbo-2.4.x-dev' into dubbo-2.4.x-dev

dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java

diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
index dc98dcf..ba068f1 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
@@ -615,7 +615,9 @@
     }

 

     public URL getUrl() {

-        overrideDirectoryUrl = overrideDirectoryUrl.addParameter(Constants.INVOKER_CONNECTED_KEY, registry.isAvailable());

+        if(registry != null) {

+            overrideDirectoryUrl = overrideDirectoryUrl.addParameter(Constants.INVOKER_CONNECTED_KEY, registry.isAvailable());

+        }

     	return overrideDirectoryUrl;

     }