svn commit: r676200 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java

[indika]

Author: indika
Date: Sat Jul 12 09:47:52 2008
New Revision: 676200

URL: http://svn.apache.org/viewvc?rev=676200&view=rev
Log:
Minor improvement

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java?rev=676200&r1=676199&r2=676200&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapsePropertiesLoader.java
 Sat Jul 12 09:47:52 2008
@@ -20,6 +20,8 @@
 
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.util.MiscellaneousUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.util.Properties;
 
@@ -29,10 +31,12 @@
  */
 public class SynapsePropertiesLoader {
 
+    private static Log log = LogFactory.getLog(SynapsePropertiesLoader.class);
+
     private SynapsePropertiesLoader() {
     }
 
-    private static Properties properties;
+    private static Properties cacheProperties;
 
     /**
      * Loads the properties
@@ -41,11 +45,26 @@
      * @return Synapse Properties
      */
     public static Properties loadSynapseProperties() {
-        if (properties == null) {
-            properties = MiscellaneousUtil.loadProperties(
+
+        if (cacheProperties == null) {
+
+            if (log.isDebugEnabled()) {
+                log.debug("Loading synapse properties from a property file");
+            }
+
+            cacheProperties = MiscellaneousUtil.loadProperties(
                     SynapseConstants.SYNAPSE_PROPERTIES);
+
+        } else {
+
+            if (log.isDebugEnabled()) {
+                log.debug("Retrieving synapse properties from the cache");
+            }
         }
-        return properties;
-    }
 
+        // Original properties needed to be preserved
+        Properties tempProperties = new Properties();
+        tempProperties.putAll(cacheProperties);
+        return tempProperties;
+    }
 }