felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1522044 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Date Wed, 11 Sep 2013 21:13:46 GMT
Author: djencks
Date: Wed Sep 11 21:13:46 2013
New Revision: 1522044

URL: http://svn.apache.org/r1522044
Log:
fix one possible partial initialization problem

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

Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java?rev=1522044&r1=1522043&r2=1522044&view=diff
==============================================================================
--- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
(original)
+++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
Wed Sep 11 21:13:46 2013
@@ -980,17 +980,17 @@ public abstract class AbstractComponentM
     }
 
 
-    boolean initDependencyManagers()
+    private void initDependencyManagers()
     {
         if ( m_dependencyManagersInitialized )
         {
-            return true;
+            return;
         }
         final Bundle bundle = getBundle();
         if (bundle == null)
         {
             log( LogService.LOG_ERROR, "bundle shut down while trying to load implementation
object class", null );
-            return false;
+            throw new IllegalStateException("bundle shut down while trying to load implementation
object class");
         }
         Class<?> implementationObjectClass;
         try
@@ -1001,7 +1001,7 @@ public abstract class AbstractComponentM
         catch ( ClassNotFoundException e )
         {
             log( LogService.LOG_ERROR, "Could not load implementation object class", e );
-            return false;
+            throw new IllegalStateException("Could not load implementation object class");
         }
         m_componentMethods.initComponentMethods( m_componentMetadata, implementationObjectClass
);
 
@@ -1010,7 +1010,6 @@ public abstract class AbstractComponentM
             dependencyManager.initBindingMethods( m_componentMethods.getBindMethods( dependencyManager.getName()
) );
         }
         m_dependencyManagersInitialized = true;
-        return true;
     }
 
     /**



Mime
View raw message