You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/03/09 08:41:26 UTC
svn commit: r1575666 -
/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
Author: rmannibucau
Date: Sun Mar 9 07:41:26 2014
New Revision: 1575666
URL: http://svn.apache.org/r1575666
Log:
avoid to pollute logs when in param is not a cdi bean for an arquillian method
Modified:
tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
Modified: tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java?rev=1575666&r1=1575665&r2=1575666&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java (original)
+++ tomee/tomee/trunk/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/enrichment/OpenEJBEnricher.java Sun Mar 9 07:41:26 2014
@@ -135,7 +135,7 @@ public final class OpenEJBEnricher {
try {
values[i] = getParamInstance(beanManager, i, am);
} catch (final Exception e) {
- LOGGER.log(Level.WARNING, e.getMessage(), e);
+ LOGGER.info(e.getMessage());
}
}
return values;
@@ -147,7 +147,14 @@ public final class OpenEJBEnricher {
final AnnotatedParameter<?> ap = am.getParameters().get(position);
final Type baseType = ap.getBaseType();
- final Bean<?> bean = manager.resolve(manager.getBeans(baseType, annotationManager.getInterceptorBindingMetaAnnotations(ap.getAnnotations())));
+ final Set<Bean<?>> beans = manager.getBeans(baseType, annotationManager.getInterceptorBindingMetaAnnotations(ap.getAnnotations()));
+ if (beans == null) {
+ return null;
+ }
+ final Bean<?> bean = manager.resolve(beans);
+ if (bean == null) {
+ return null;
+ }
// note: without a scope it can leak but that's what the user asked!
final CreationalContextImpl<?> creational = manager.createCreationalContext(null); // null since we don't want the test class be the owner