felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1463820 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java
Date Wed, 03 Apr 2013 04:13:29 GMT
Author: djencks
Date: Wed Apr  3 04:13:29 2013
New Revision: 1463820

URL: http://svn.apache.org/r1463820
Log:
FELIX-4011 fix NPE

Modified:
    felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java?rev=1463820&r1=1463819&r2=1463820&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ServiceFactoryComponentManager.java
Wed Apr  3 04:13:29 2013
@@ -184,7 +184,6 @@ public class ServiceFactoryComponentMana
 
         disposeImplementationObject( serviceContext, ComponentConstants.DEACTIVATION_REASON_DISPOSED
);
         serviceContexts.remove( service );
-        cleanupImplementationObject( service );
         // if this was the last use of the component, go back to REGISTERED state
         if ( serviceContexts.isEmpty() && getState() == STATE_ACTIVE )
         {
@@ -198,11 +197,6 @@ public class ServiceFactoryComponentMana
         return serviceContexts.get( implObject ).getEdgeInfo( dependencyManager );
     }
 
-    protected void cleanupImplementationObject( Object implementationObject )
-    {
-        serviceContexts.get( implementationObject ).clearEdgeInfos();
-    }
-
     <T> void invokeBindMethod( DependencyManager<S, T> dependencyManager, RefPair<T>
refPair, int trackingCount )
     {
         for ( S implementationObject : serviceContexts.keySet() )



Mime
View raw message