[servicemix-scm] Fix SM-84 : NPE

[gnt]

Commit in servicemix/base/src/main/java/org/servicemix/jbi/nmr/flow on MAIN
jca/JCAFlow.java	+9	-7	1.6 -> 1.7
jms/JMSFlow.java	+9	-7	1.5 -> 1.6
cluster/ClusterFlow.java	+9	-7	1.14 -> 1.15
	+27	-21

3 modified files

Fix SM-84 : NPE

---

servicemix/base/src/main/java/org/servicemix/jbi/nmr/flow/jca

JCAFlow.java 1.6 -> 1.7

diff -u -r1.6 -r1.7
--- JCAFlow.java	7 Oct 2005 09:55:52 -0000	1.6
+++ JCAFlow.java	10 Oct 2005 09:11:56 -0000	1.7
@@ -75,7 +75,7 @@

 /**
  * Use for message routing among a network containers. All routing/registration happens automatically
  * 

- * @version $Revision: 1.6 $

+ * @version $Revision: 1.7 $

  */
 public class JCAFlow extends SedaFlow implements ConsumerAdvisoryEventListener, MessageListener {
     private static final Log log = LogFactory.getLog(JCAFlow.class);

@@ -553,12 +553,14 @@

 
     private void removeAllPackets(String containerName) {
         Set set = (Set) networkNodeKeyMap.remove(containerName);

-        for (Iterator i = set.iterator();i.hasNext();) {
-            ComponentPacket packet = (ComponentPacket) i.next();
-            ComponentConnector cc = new ComponentConnector(packet);
-            log.info("Network node: " + containerName + " Stopped. Removing remote Component: " + cc);
-            broker.getRegistry().removeRemoteComponentConnector(cc);
-            networkComponentKeyMap.remove(packet.getComponentNameSpace());

+        if (set != null) {
+	        for (Iterator i = set.iterator();i.hasNext();) {
+	            ComponentPacket packet = (ComponentPacket) i.next();
+	            ComponentConnector cc = new ComponentConnector(packet);
+	            log.info("Network node: " + containerName + " Stopped. Removing remote Component: " + cc);
+	            broker.getRegistry().removeRemoteComponentConnector(cc);
+	            networkComponentKeyMap.remove(packet.getComponentNameSpace());
+	        }

         }
     }
 

---

servicemix/base/src/main/java/org/servicemix/jbi/nmr/flow/jms

JMSFlow.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- JMSFlow.java	7 Oct 2005 09:55:52 -0000	1.5
+++ JMSFlow.java	10 Oct 2005 09:11:57 -0000	1.6
@@ -59,7 +59,7 @@

 /**
  * Use for message routing among a network containers. All routing/registration happens automatically
  * 

- * @version $Revision: 1.5 $

+ * @version $Revision: 1.6 $

  */
 public class JMSFlow extends SedaFlow implements ConsumerAdvisoryEventListener, MessageListener {
     private static final Log log = LogFactory.getLog(JMSFlow.class);

@@ -457,12 +457,14 @@

 
     private void removeAllPackets(String containerName) {
         Set set = (Set) networkNodeKeyMap.remove(containerName);

-        for (Iterator i = set.iterator();i.hasNext();) {
-            ComponentPacket packet = (ComponentPacket) i.next();
-            ComponentConnector cc = new ComponentConnector(packet);
-            log.info("Network node: " + containerName + " Stopped. Removing remote Component: " + cc);
-            broker.getRegistry().removeRemoteComponentConnector(cc);
-            networkComponentKeyMap.remove(packet.getComponentNameSpace());

+        if (set != null) {
+	        for (Iterator i = set.iterator();i.hasNext();) {
+	            ComponentPacket packet = (ComponentPacket) i.next();
+	            ComponentConnector cc = new ComponentConnector(packet);
+	            log.info("Network node: " + containerName + " Stopped. Removing remote Component: " + cc);
+	            broker.getRegistry().removeRemoteComponentConnector(cc);
+	            networkComponentKeyMap.remove(packet.getComponentNameSpace());
+	        }

         }
     }
 }

---

servicemix/base/src/main/java/org/servicemix/jbi/nmr/flow/cluster

ClusterFlow.java 1.14 -> 1.15

diff -u -r1.14 -r1.15
--- ClusterFlow.java	7 Oct 2005 12:24:32 -0000	1.14
+++ ClusterFlow.java	10 Oct 2005 09:11:57 -0000	1.15
@@ -53,7 +53,7 @@

 /**
  * Use for message routing amonst a cluster of containers. All routing/cluster registration happens automatically
  * 

- * @version $Revision: 1.14 $

+ * @version $Revision: 1.15 $

  */
 public class ClusterFlow extends SedaFlow implements ClusterListener, MessageListener {
     private static final Log log = LogFactory.getLog(ClusterFlow.class);

@@ -399,12 +399,14 @@

 
     private void removeAllPackets(Destination nodeName) {
         Set set = (Set) clusterNodeKeyMap.remove(nodeName);

-        for (Iterator i = set.iterator();i.hasNext();) {
-            ComponentPacket packet = (ComponentPacket) i.next();
-            ComponentConnector cc = new ComponentConnector(packet);
-            log.info("Cluster node: " + nodeName + " Stopped. Removing remote Component: " + cc);
-            broker.getRegistry().removeRemoteComponentConnector(cc);
-            clusterComponentKeyMap.remove(packet.getComponentNameSpace());

+        if (set != null) {
+	        for (Iterator i = set.iterator();i.hasNext();) {
+	            ComponentPacket packet = (ComponentPacket) i.next();
+	            ComponentConnector cc = new ComponentConnector(packet);
+	            log.info("Cluster node: " + nodeName + " Stopped. Removing remote Component: " + cc);
+	            broker.getRegistry().removeRemoteComponentConnector(cc);
+	            clusterComponentKeyMap.remove(packet.getComponentNameSpace());
+	        }

         }
     }
 }

CVSspam 0.2.8