[teiid-commits] teiid SVN: r1044 - trunk/server/src/main/java/com/metamatrix/platform/config/util.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-06-11 17:23:16 -0400 (Thu, 11 Jun 2009)
New Revision: 1044

Modified:
   trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java
Log:
Teiid-570 -  added the call to reset()  the configurationmgr so that it's cleared when a new configuration is loaded.

Modified: trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java
===================================================================
--- trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java	2009-06-11 21:21:13 UTC (rev 1043)
+++ trunk/server/src/main/java/com/metamatrix/platform/config/util/CurrentConfigHelper.java	2009-06-11 21:23:16 UTC (rev 1044)
@@ -36,6 +36,7 @@
 import com.metamatrix.platform.config.persistence.api.PersistentConnection;
 import com.metamatrix.platform.config.persistence.api.PersistentConnectionFactory;
 import com.metamatrix.platform.config.persistence.impl.file.FilePersistentConnection;
+import com.metamatrix.platform.config.spi.xml.XMLConfigurationMgr;
 import com.metamatrix.platform.config.spi.xml.XMLCurrentConfigurationReader;
 
 /**
@@ -108,10 +109,14 @@
 		System.setProperties(sysProps);	
 		
 		cleanModelFile(principal, fileName, path);		
-		CurrentConfiguration.reset();
 		
 		createSystemProperties(fileName, path);
 		
+		CurrentConfiguration.reset();
+		
+		XMLConfigurationMgr.getInstance().reset();
+
+		
 		CurrentConfiguration.getInstance().getConfiguration();
 	}