DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-03-24 21:22:48 +0100 (Fri, 24 Mar 2006)
New Revision: 1266

Modified:
   
trunk/main/transit/core/src/main/net/dpml/transit/util/PropertyResolver.java
Log:
fix bug in property substitution logic where symbolic values are derived from 
*both* a supplied properties instances and system properties

Modified: 
trunk/main/transit/core/src/main/net/dpml/transit/util/PropertyResolver.java
===================================================================
--- 
trunk/main/transit/core/src/main/net/dpml/transit/util/PropertyResolver.java  
      2006-03-24 18:46:27 UTC (rev 1265)
+++ 
trunk/main/transit/core/src/main/net/dpml/transit/util/PropertyResolver.java  
      2006-03-24 20:22:48 UTC (rev 1266)
@@ -70,9 +70,10 @@
             String name = (String) names.nextElement();
             String old = properties.getProperty( name );
             String value = resolve( old );
-            if( !value.equals( old ) )
+            String v2 = resolve( properties, value );
+            if( !v2.equals( old ) )
             {
-                properties.setProperty( name, value );
+                properties.setProperty( name, v2 );
             }
         }
         return properties;