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

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

Author: adinn
Date: 2010-08-13 04:13:53 -0400 (Fri, 13 Aug 2010)
New Revision: 34693

Modified:
   labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java
Log:
added extra API method to BeanPopulator to allow XTS code to supply its own properties -- fixes for JBTM-678

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	2010-08-13 06:09:32 UTC (rev 34692)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/propertyservice/BeanPopulator.java	2010-08-13 08:13:53 UTC (rev 34693)
@@ -39,6 +39,9 @@
     private static final ConcurrentMap<Class, Object> singletonBeanInstances = new ConcurrentHashMap<Class, Object>();
 
     public static <T> T getSingletonInstance(Class<T> beanClass) throws RuntimeException {
+        return getSingletonInstance(beanClass, null);
+    }
+    public static <T> T getSingletonInstance(Class<T> beanClass, Properties properties) throws RuntimeException {
 
         // we don't mind sometimes instantiating the bean multiple times,
         // as long as the duplicates never escape into the outside world.
@@ -46,8 +49,12 @@
             T bean = null;
             try {
                 bean = beanClass.newInstance();
-                Properties properties = PropertiesFactory.getDefaultProperties();
-                configureFromProperties(bean, properties);
+                if (properties != null) {
+                    configureFromProperties(bean, properties);
+                } else {
+                    Properties defaultProperties = PropertiesFactory.getDefaultProperties();
+                    configureFromProperties(bean, defaultProperties);
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }