You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/07/31 01:48:55 UTC

svn commit: r799473 - /tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java

Author: rfeng
Date: Thu Jul 30 23:48:54 2009
New Revision: 799473

URL: http://svn.apache.org/viewvc?rev=799473&view=rev
Log:
Check null to avoid NPE

Modified:
    tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java

Modified: tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java?rev=799473&r1=799472&r2=799473&view=diff
==============================================================================
--- tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java (original)
+++ tuscany/java/sca/modules/endpoint/src/main/java/org/apache/tuscany/sca/endpoint/impl/EndpointRegistryImpl.java Thu Jul 30 23:48:54 2009
@@ -200,12 +200,16 @@
 
     public void stop() {
         List<Endpoint> localEndpoints = endpoints.remove(this);
-        for (Endpoint endpoint : localEndpoints) {
-            removeEndpoint(endpoint);
+        if (localEndpoints != null) {
+            for (Endpoint endpoint : localEndpoints) {
+                removeEndpoint(endpoint);
+            }
         }
         List<EndpointReference> localEndpointReferences = endpointreferences.remove(this);
-        for (EndpointReference endpointReference : localEndpointReferences) {
-            removeEndpointReference(endpointReference);
+        if (localEndpointReferences != null) {
+            for (EndpointReference endpointReference : localEndpointReferences) {
+                removeEndpointReference(endpointReference);
+            }
         }
         listeners.clear();
     }