commit | 1f98ada8c78969eaa2097a3386515c22c44836b9 | [log] [tgz] |
---|---|---|
author | Felix Meschberger <fmeschbe@apache.org> | Tue Jan 26 12:58:01 2010 +0000 |
committer | Felix Meschberger <fmeschbe@apache.org> | Tue Jan 26 12:58:01 2010 +0000 |
tree | 03ee590ec13c755871c5e1fd5258aee08d7dfd5c | |
parent | a489363032c85c68adb5990e3699cc31c3f64689 [diff] |
FELIX-2006 Catch Throwable instead of Exception to properly handle instantiation failure if loading the implementation class fails. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@903203 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java index 36d74e4..0e86353 100644 --- a/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java +++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/ImmediateComponentManager.java
@@ -182,10 +182,10 @@ // may be created by the SCR with the newInstance method on Class implementationObject = implementationObjectClass.newInstance(); } - catch ( Exception ex ) + catch ( Throwable t ) { // failed to instantiate, return null - log( LogService.LOG_ERROR, "Error during instantiation of the implementation object", ex ); + log( LogService.LOG_ERROR, "Error during instantiation of the implementation object", t ); return null; }