You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/11/01 00:50:06 UTC
svn commit: r1845390 -
/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
Author: rotty3000
Date: Thu Nov 1 00:50:05 2018
New Revision: 1845390
URL: http://svn.apache.org/viewvc?rev=1845390&view=rev
Log:
[CDI] handle Errors which are not exceptions
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java?rev=1845390&r1=1845389&r2=1845390&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/BeansModelBuilder.java Thu Nov 1 00:50:05 2018
@@ -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 @@ public class BeansModelBuilder {
_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);
}
}