[teiid-commits] teiid SVN: r1221 - 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-07 15:37:21 -0400 (Fri, 07 Aug 2009)
New Revision: 1221

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:36:41 UTC (rev 1220)
+++ trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java	2009-08-07 19:37:21 UTC (rev 1221)
@@ -1001,7 +1001,9 @@
 	    while ( itr.hasMoreElements() ) {
 	        final String name = (String) itr.nextElement();
 	        String propValue = connectionProps.getProperty(name);
-            lcProps.setProperty(name.toLowerCase(), propValue);
+	        if (propValue != null) {
+	        	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:36:41 UTC (rev 1220)
+++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java	2009-08-07 19:37:21 UTC (rev 1221)
@@ -723,6 +723,7 @@
     	p.setProperty("prop3", "3"); //$NON-NLS-1$ //$NON-NLS-2$
     	
     	p = new Properties(p);
+    	p.put("object", new Object()); //$NON-NLS-1$
     	
     	PropertiesUtils.setBeanProperties(bean, p, null);