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

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2009-08-25 16:26:27 -0400 (Tue, 25 Aug 2009)
New Revision: 1279

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-801

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-25 19:40:43 UTC (rev 1278)
+++ trunk/common-core/src/main/java/com/metamatrix/common/util/PropertiesUtils.java	2009-08-25 20:26:27 UTC (rev 1279)
@@ -803,6 +803,7 @@
             }
 
             boolean matched = true;
+            boolean modified = false;
             
             while(matched) {
                 // now match the pattern, then extract and find the value
@@ -821,9 +822,12 @@
                     	throw new MetaMatrixRuntimeException(CorePlugin.Util.getString("PropertiesUtils.failed_to_resolve_property", nestedkey)); //$NON-NLS-1$
                     }                    
                     value = value.substring(0,start)+nestedvalue+value.substring(end+1);
+                    modified = true;
                 }
             }
-            original.setProperty(key, value);
+            if(modified) {
+            	original.setProperty(key, value);
+            }
         }
         return original;
     }

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-25 19:40:43 UTC (rev 1278)
+++ trunk/common-core/src/test/java/com/metamatrix/common/util/TestPropertiesUtils.java	2009-08-25 20:26:27 UTC (rev 1279)
@@ -632,6 +632,7 @@
         p.setProperty("key4", "${key2}/value4"); //$NON-NLS-1$ //$NON-NLS-2$
         p.setProperty("key5", "${testdirectory}/testdata"); //$NON-NLS-1$ //$NON-NLS-2$
         p.setProperty("key7", "anotherdir/${testdirectory}/${key1}"); //$NON-NLS-1$ //$NON-NLS-2$
+        int currentSize = p.size();
         
         Properties m = PropertiesUtils.resolveNestedProperties(p);
         assertEquals("value1/value2", m.getProperty("key2")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -640,7 +641,7 @@
         assertEquals("c:/metamatrix/testdirectory/testdata", m.getProperty("key5")); //$NON-NLS-1$ //$NON-NLS-2$
         assertEquals("anotherdir/c:/metamatrix/testdirectory/value1", m.getProperty("key7")); //$NON-NLS-1$ //$NON-NLS-2$
         assertTrue(p == m); // no cloning.
-
+        assertTrue(currentSize == m.size());
         
         p.setProperty("key6", "${foo}"); //$NON-NLS-1$ //$NON-NLS-2$