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 2012/03/06 21:47:10 UTC
svn commit: r1297709 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Author: rmannibucau
Date: Tue Mar 6 20:47:09 2012
New Revision: 1297709
URL: http://svn.apache.org/viewvc?rev=1297709&view=rev
Log:
checking if @Proxy is here or not
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1297709&r1=1297708&r2=1297709&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Tue Mar 6 20:47:09 2012
@@ -1923,7 +1923,13 @@ public class AnnotationDeployer implemen
annotationFinder = createFinder(clazz);
finder = new AnnotationFinder(new ClassesArchive(clazz));
} else {
- final Class<?>[] classes = new Class<?>[] { clazz, metaClass.getAnnotation(Proxy.class).value() };
+ final Class<?>[] classes;
+ final Proxy proxy = metaClass.getAnnotation(Proxy.class);
+ if (proxy == null) {
+ classes = new Class<?>[] { clazz };
+ } else {
+ classes = new Class<?>[] { clazz, proxy.value() };
+ }
annotationFinder = createFinder(classes);
finder = new AnnotationFinder(new ClassesArchive(classes));
}