[CDI] handle Errors which are not exceptions
Signed-off-by: Raymond Auge <rotty3000@apache.org>
git-svn-id: https://svn.apache.org/repos/asf/aries/trunk@1845390 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
index dd98744..5fc2fc9 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
@@ -14,8 +14,9 @@
package org.apache.aries.cdi.container.internal.model;
-import static org.apache.aries.cdi.container.internal.util.Reflection.*;
-import static org.osgi.service.cdi.CDIConstants.*;
+import static org.apache.aries.cdi.container.internal.util.Reflection.cast;
+import static org.osgi.service.cdi.CDIConstants.REQUIREMENT_BEANS_ATTRIBUTE;
+import static org.osgi.service.cdi.CDIConstants.REQUIREMENT_DESCRIPTOR_ATTRIBUTE;
import java.net.URL;
import java.util.ArrayList;
@@ -77,10 +78,10 @@
_log.debug(l -> l.debug("CCR found bean {} on {}", beanClassName, _containerState.bundle()));
}
- catch (Exception e) {
- _log.error(l -> l.error("CCR Error loading class {} on {}", beanClassName, _containerState.bundle(), e));
+ catch (Throwable t) {
+ _log.error(l -> l.error("CCR Error loading class {} on {}", beanClassName, _containerState.bundle(), t));
- _containerState.error(e);
+ _containerState.error(t);
}
}
