svn commit: r1404965 - /cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java

[cschneider]

Author: cschneider
Date: Fri Nov  2 14:03:53 2012
New Revision: 1404965

URL: http://svn.apache.org/viewvc?rev=1404965&view=rev
Log:
DOSGI-134 Some small cleanups

Modified:
    
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java

Modified: 
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java?rev=1404965&r1=1404964&r2=1404965&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
 Fri Nov  2 14:03:53 2012
@@ -90,8 +90,6 @@ public class TopologyManagerExport imple
             }
 
             public void removed(RemoteServiceAdmin rsa) {
-                // TODO: remove service exports from management structure and 
notify
-                // discovery stuff...
                 removeRemoteServiceAdmin(rsa);
             }
         });
@@ -123,19 +121,18 @@ public class TopologyManagerExport imple
         return false;
     }
 
+    /**
+     * Remove all services exported by the given rsa and notify listeners
+     * @param rsa
+     */
     protected void removeRemoteServiceAdmin(RemoteServiceAdmin rsa) {
         synchronized (exportedServices) {
-            for (Map.Entry<ServiceReference, Map<RemoteServiceAdmin, 
Collection<ExportRegistration>>> exports : exportedServices
-                .entrySet()) {
-                if (exports.getValue().containsKey(rsa)) {
-                    // service was handled by this RemoteServiceAdmin
-                    Collection<ExportRegistration> endpoints = 
exports.getValue().get(rsa);
-                    // TODO for each notify discovery......
-
+            for (Map<RemoteServiceAdmin, Collection<ExportRegistration>> 
exports : exportedServices
+                .values()) {
+                if (exports.containsKey(rsa)) {
+                    Collection<ExportRegistration> endpoints = 
exports.get(rsa);
                     
this.epListenerNotifier.notifyAllListenersOfRemoval(endpoints);
-
-                    // remove all management information for the 
RemoteServiceAdmin
-                    exports.getValue().remove(rsa);
+                    exports.remove(rsa);
                 }
             }
         }