You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by fm...@apache.org on 2010/03/18 15:08:27 UTC

svn commit: r924787 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java

Author: fmeschbe
Date: Thu Mar 18 14:08:27 2010
New Revision: 924787

URL: http://svn.apache.org/viewvc?rev=924787&view=rev
Log:
FELIX-2213 do not try to call any optional modify() method if the component has not yet been instantiated

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

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java?rev=924787&r1=924786&r2=924787&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java (original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java Thu Mar 18 14:08:27 2010
@@ -409,6 +409,12 @@ public class ImmediateComponentManager e
     }
 
     private boolean modify() {
+        // 0. no live update if there is no instance
+        if ( getInstance() == null )
+        {
+            return false;
+        }
+
         // 1. no live update if there is no declared method
         if ( getComponentMetadata().getModified() == null )
         {