[jboss-svn-commits] JBL Code SVN: r36863 - labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice.

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

Author: jhalliday
Date: 2011-03-28 05:30:59 -0400 (Mon, 28 Mar 2011)
New Revision: 36863

Modified:
   labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java
Log:
Performance tweak for environment bean resolution. JBTM-831


Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java	2011-03-22 14:40:17 UTC (rev 36862)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java	2011-03-28 09:30:59 UTC (rev 36863)
@@ -56,7 +56,7 @@
         if(name == null) {
             name = DEFAULT_NAME;
         }
-        String key = beanClass.getCanonicalName()+":"+name;
+        String key = beanClass.getName()+":"+name;
 
         // we don't mind sometimes instantiating the bean multiple times,
         // as long as the duplicates never escape into the outside world.
@@ -314,12 +314,12 @@
         if(valueFromProperties == null) {
 
             if(DEFAULT_NAME.equals(instanceName)) {
-                propertyFileKey = bean.getClass().getCanonicalName()+"."+field.getName();
+                propertyFileKey = bean.getClass().getName()+"."+field.getName();
                 valueFromProperties = properties.getProperty(propertyFileKey);
             }
 
             if(valueFromProperties == null) {
-                propertyFileKey = bean.getClass().getCanonicalName()+"."+instanceName+"."+field.getName();
+                propertyFileKey = bean.getClass().getName()+"."+instanceName+"."+field.getName();
                 valueFromProperties = properties.getProperty(propertyFileKey);
             }
         }
@@ -355,7 +355,7 @@
     {
         String lineSeparator = System.getProperty("line.separator");
         buffer.append("Bean class: ");
-        buffer.append(bean.getClass().getCanonicalName());
+        buffer.append(bean.getClass().getName());
         buffer.append(lineSeparator);
 
         for(Field field : bean.getClass().getDeclaredFields()) {