[jboss-cvs] JBossAS SVN: r79164 - projects/jboss-mdr/trunk/src/main/java/org/jboss/annotation/factory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-10-06 15:20:25 -0400 (Mon, 06 Oct 2008)
New Revision: 79164

Modified:
   projects/jboss-mdr/trunk/src/main/java/org/jboss/annotation/factory/AnnotationCreator.java
Log:
Revert to old classloader-less behavior, adding WARN to it.

Modified: projects/jboss-mdr/trunk/src/main/java/org/jboss/annotation/factory/AnnotationCreator.java
===================================================================
--- projects/jboss-mdr/trunk/src/main/java/org/jboss/annotation/factory/AnnotationCreator.java	2008-10-06 19:16:04 UTC (rev 79163)
+++ projects/jboss-mdr/trunk/src/main/java/org/jboss/annotation/factory/AnnotationCreator.java	2008-10-06 19:20:25 UTC (rev 79164)
@@ -46,6 +46,7 @@
 import org.jboss.annotation.factory.ast.Node;
 import org.jboss.annotation.factory.ast.SimpleNode;
 import org.jboss.annotation.factory.javassist.DefaultValueAnnotationValidator;
+import org.jboss.logging.Logger;
 import org.jboss.util.StringPropertyReplacer;
 
 /**
@@ -53,10 +54,13 @@
  *
  * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
  * @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
  * @version $Revision$
  */
 public class AnnotationCreator implements AnnotationParserVisitor
 {
+   private static final Logger log = Logger.getLogger(AnnotationCreator.class);
+
    private Class<?> annotation;
    private Class<?> type;
    public Object typeValue;
@@ -100,7 +104,6 @@
       this.loader = Thread.currentThread().getContextClassLoader();
    }
 
-
    public Object visit(ASTMemberValuePairs node, Object data)
    {
       node.childrenAccept(this, data);
@@ -367,12 +370,10 @@
       {
          loader = cl;
       }
-      else if (annotation != null)
-      {
-         loader = annotation.getClassLoader();
-      }
       else
       {
+         String info = (annotation != null) ? annotation.getName() : node.getIdentifier();
+         log.warn("No ClassLoader provided, using TCCL: " + info);
          loader = Thread.currentThread().getContextClassLoader();
       }