svn commit: r893070 - in /synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config: SynapseConfigurationBuilder.java xml/MultiXMLConfigurationSerializer.java

[hiranya]

Author: hiranya
Date: Tue Dec 22 05:04:35 2009
New Revision: 893070

URL: http://svn.apache.org/viewvc?rev=893070&view=rev
Log:
Minor code changes in the synapse config builder and the multi xml serializer


Modified:
    
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
    
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationSerializer.java

Modified: 
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java?rev=893070&r1=893069&r2=893070&view=diff
==============================================================================
--- 
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
 (original)
+++ 
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigurationBuilder.java
 Tue Dec 22 05:04:35 2009
@@ -86,7 +86,6 @@
             try {
                 synCfg = XMLConfigurationBuilder.getConfiguration(new 
FileInputStream(configFile));
                 log.info("Loaded Synapse configuration from : " + configFile);
-                synCfg.setPathToConfigFile(new 
File(configFile).getAbsolutePath());
             } catch (Exception e) {
                 handleException("Could not initialize Synapse : " + 
e.getMessage(), e);
             }
@@ -103,6 +102,7 @@
         }
 
         assert synCfg != null;
+        synCfg.setPathToConfigFile(new File(configFile).getAbsolutePath());
         Registry localConfigReg = synCfg.getRegistry();
         if (synCfg.getLocalRegistry().isEmpty() && 
synCfg.getProxyServices().isEmpty()
                 && localConfigReg != null) {

Modified: 
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationSerializer.java
URL: 
http://svn.apache.org/viewvc/synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationSerializer.java?rev=893070&r1=893069&r2=893070&view=diff
==============================================================================
--- 
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationSerializer.java
 (original)
+++ 
synapse/branches/1.3/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationSerializer.java
 Tue Dec 22 05:04:35 2009
@@ -115,7 +115,9 @@
 
             // If a backup was created, clean it up
             if (backupDirectory != null) {
-                log.info("Cleaning up the backup files at : " + 
backupDirectory.getPath());
+                if (log.isDebugEnabled()) {
+                    log.debug("Cleaning up the backup files at : " + 
backupDirectory.getPath());
+                }
                 deleteDirectory(backupDirectory);
                 backupDirectory = null;
             }