[esb-java-dev] svn commit r32029 - branches/esb/java/2.0.1/carbon-components/proxy-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin

[ruwan at wso2.com]

Author: ruwan
Date: Tue Mar 10 23:39:12 2009
New Revision: 32029
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32029

Log:
Fixing the proxy save issue

Modified:
   branches/esb/java/2.0.1/carbon-components/proxy-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin/DeleteProxyObserver.java

Modified: branches/esb/java/2.0.1/carbon-components/proxy-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin/DeleteProxyObserver.java
URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/proxy-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin/DeleteProxyObserver.java?rev=32029&r1=32028&r2=32029&view=diff
==============================================================================
--- branches/esb/java/2.0.1/carbon-components/proxy-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin/DeleteProxyObserver.java	(original)
+++ branches/esb/java/2.0.1/carbon-components/proxy-admin/org.wso2.carbon.proxyadmin/src/main/java/org/wso2/carbon/proxyadmin/DeleteProxyObserver.java	Tue Mar 10 23:39:12 2009
@@ -25,10 +25,12 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEvent;
 import org.apache.axis2.engine.AxisObserver;
+import org.apache.axis2.util.JavaUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.config.SynapseConfiguration;
+import org.wso2.carbon.CarbonConstants;
 
 import java.util.ArrayList;
 
@@ -45,17 +47,20 @@
     public void serviceUpdate(AxisEvent event, AxisService axisService) {
         if (AxisEvent.SERVICE_REMOVE == event.getEventType()) {
             Parameter serviceTypeParam = axisService.getParameter("serviceType");
-            if ("proxy".equals(serviceTypeParam.getValue().toString())) {
-                Parameter synCfg
-                        = axisService.getAxisConfiguration().getParameter(SynapseConstants.SYNAPSE_CONFIG);
+            Parameter keepServiceHistoryParam = axisService.getParameter(
+                    CarbonConstants.KEEP_SERVICE_HISTORY_PARAM);
+            if ("proxy".equals(serviceTypeParam.getValue().toString())
+                    && !JavaUtils.isTrue(keepServiceHistoryParam.getValue())) {
+                Parameter synCfg = axisService.getAxisConfiguration().getParameter(
+                        SynapseConstants.SYNAPSE_CONFIG);
                 if (synCfg.getValue() instanceof SynapseConfiguration) {
                     SynapseConfiguration config = (SynapseConfiguration) synCfg.getValue();
                     if (config.getProxyService(axisService.getName()) != null) {
                         config.removeProxyService(axisService.getName());
                     }
                 } else if (log.isDebugEnabled()) {
-                    log.debug("Cannot remove the Proxy Service " + axisService.getName() + " from Synapse : " +
-                            "SynapseConfiguration not found");
+                    log.debug("Cannot remove the Proxy Service " + axisService.getName()
+                            + " from Synapse : " + "SynapseConfiguration not found");
                 }
             }
         }