[servicemix-scm] [678] trunk/core/src/main/java/org/servicemix/jbi/nmr/Broker.java: Fix possible NPE

[scm]

Title: [678] trunk/core/src/main/java/org/servicemix/jbi/nmr/Broker.java: Fix possible NPE

Revision

678

Author

gnt

Date

2005-10-26 09:12:34 -0400 (Wed, 26 Oct 2005)

Log Message

Fix possible NPE

Modified Paths

• trunk/core/src/main/java/org/servicemix/jbi/nmr/Broker.java

Diff

Modified: trunk/core/src/main/java/org/servicemix/jbi/nmr/Broker.java (677 => 678)

--- trunk/core/src/main/java/org/servicemix/jbi/nmr/Broker.java	2005-10-26 13:08:55 UTC (rev 677)
+++ trunk/core/src/main/java/org/servicemix/jbi/nmr/Broker.java	2005-10-26 13:12:34 UTC (rev 678)
@@ -176,7 +176,7 @@
      */
     public void start() throws JBIException {
         flow.start();
-        if (subscriptionManager.getFlow() != flow) {
+        if (subscriptionManager.getFlow() != flow && subscriptionManager.getFlow() != null) {
         	subscriptionManager.getFlow().start();
         }
         super.start();
@@ -189,7 +189,7 @@
      */
     public void stop() throws JBIException {
         flow.stop();
-        if (subscriptionManager.getFlow() != flow) {
+        if (subscriptionManager.getFlow() != flow && subscriptionManager.getFlow() != null) {
 	        subscriptionManager.getFlow().stop();
         }
         super.stop();
@@ -203,7 +203,7 @@
     public void shutDown() throws JBIException {
         stop();
         flow.shutDown();
-        if (subscriptionManager.getFlow() != flow) {
+        if (subscriptionManager.getFlow() != flow && subscriptionManager.getFlow() != null) {
         	subscriptionManager.getFlow().shutDown();
         }
         super.shutDown();