fix one possible partial initialization problem
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1522044 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
index 8e9d5f2..a95c459 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -980,17 +980,17 @@
}
- 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 @@
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 @@
dependencyManager.initBindingMethods( m_componentMethods.getBindMethods( dependencyManager.getName() ) );
}
m_dependencyManagersInitialized = true;
- return true;
}
/**