You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/07/16 14:53:53 UTC

svn commit: r677271 - /servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java

Author: gertv
Date: Wed Jul 16 05:53:52 2008
New Revision: 677271

URL: http://svn.apache.org/viewvc?rev=677271&view=rev
Log:
SMX4NMR-38: Avoiding NPE when wrappedComponents.remove() returns null

Modified:
    servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=677271&r1=677270&r2=677271&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Wed Jul 16 05:53:52 2008
@@ -405,7 +405,7 @@
 
     protected void maybeUnwrapComponent(ServiceReference reference, javax.jbi.component.Component component) {
         String name = (String) reference.getProperty(NAME);
-        if (name != null && wrappedComponents.remove(name)) {
+        if (name != null && Boolean.TRUE.equals(wrappedComponents.remove(name))) {
             components.remove(name);
         }
     }