[teiid-commits] teiid SVN: r1220 - in trunk/common-core/src: test/java/com/metamatrix/common/util and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-08-06 22:36:41 -0400 (Thu, 06 Aug 2009)
New Revision: 1220

Modified:
   trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java
   trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java
Log:
TEIID-743 fixing bean setting logic to use all properties including defaults

Modified: trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java
===================================================================
--- trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java	2009-08-07 02:33:46 UTC (rev 1219)
+++ trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java	2009-08-07 02:36:41 UTC (rev 1220)
@@ -997,15 +997,11 @@
 
 	private static Properties lowerCaseAllPropNames(final Properties connectionProps) {
 	    final Properties lcProps = new Properties();
-	    final Iterator itr = connectionProps.keySet().iterator();
-	    while ( itr.hasNext() ) {
-	        final String name = (String) itr.next();
-	        Object propValue = connectionProps.get(name);
-	        if (propValue instanceof String) {
-	            // we're only interested in prop values of type String
-	            // here since we'll be looking for params to reflected methods
-	            lcProps.setProperty(name.toLowerCase(), (String)propValue);
-	        } // if
+	    final Enumeration<?> itr = connectionProps.propertyNames();
+	    while ( itr.hasMoreElements() ) {
+	        final String name = (String) itr.nextElement();
+	        String propValue = connectionProps.getProperty(name);
+            lcProps.setProperty(name.toLowerCase(), propValue);
 	    }
 	    return lcProps;
 	}

Modified: trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java
===================================================================
--- trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java	2009-08-07 02:33:46 UTC (rev 1219)
+++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java	2009-08-07 02:36:41 UTC (rev 1220)
@@ -722,6 +722,8 @@
     	p.setProperty("prop2", "2"); //$NON-NLS-1$ //$NON-NLS-2$
     	p.setProperty("prop3", "3"); //$NON-NLS-1$ //$NON-NLS-2$
     	
+    	p = new Properties(p);
+    	
     	PropertiesUtils.setBeanProperties(bean, p, null);
     	
     	assertEquals(0, bean.getProp());