[jboss-cvs] JBossAS SVN: r73039 - projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations.

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

Author: alesj
Date: 2008-05-04 15:10:20 -0400 (Sun, 04 May 2008)
New Revision: 73039

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BeanAnnotationAdapterFactory.java
Log:
Fix usage of protected constructor.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BeanAnnotationAdapterFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BeanAnnotationAdapterFactory.java	2008-05-04 18:22:14 UTC (rev 73038)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/BeanAnnotationAdapterFactory.java	2008-05-04 19:10:20 UTC (rev 73039)
@@ -37,7 +37,7 @@
    private static Logger log = Logger.getLogger(BeanAnnotationAdapterFactory.class);
    private static final BeanAnnotationAdapterFactory factory = new BeanAnnotationAdapterFactory();
 
-   private String adapterClassName = BasicBeanAnnotationAdapter.class.getName();
+   private String adapterClassName;
    private BeanAnnotationAdapter adapter;
 
    private BeanAnnotationAdapterFactory()
@@ -73,16 +73,19 @@
          try
          {
             String adapterClass = System.getProperty("org.jboss.kernel.plugins.annotations.BeanAnnotationAdapter", adapterClassName);
-            if (log.isTraceEnabled())
-               log.trace("Instantiating bean annotation adapter: " + adapterClass);
-            Object result = ReflectionUtils.newInstance(adapterClass);
-            return BeanAnnotationAdapter.class.cast(result);
+            if (adapterClass != null)
+            {
+               if (log.isTraceEnabled())
+                  log.trace("Instantiating bean annotation adapter: " + adapterClass);
+               Object result = ReflectionUtils.newInstance(adapterClass);
+               return BeanAnnotationAdapter.class.cast(result);
+            }
          }
          catch (Throwable t)
          {
             log.warn("Exception while creating bean annotation adapter instance: " + t);
-            return BasicBeanAnnotationAdapter.INSTANCE;
          }
+         return BasicBeanAnnotationAdapter.INSTANCE;
       }
    }