svn commit: r1509809 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java

[hiranya]

Author: hiranya
Date: Fri Aug  2 18:58:49 2013
New Revision: 1509809

URL: http://svn.apache.org/r1509809
Log:
Applying patch for SYNAPSE-874

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?rev=1509809&r1=1509808&r2=1509809&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
 Fri Aug  2 18:58:49 2013
@@ -741,17 +741,13 @@ public class ProxyService implements Asp
                 targetInLineFaultSequence.destroy();
             }
 
-            try {
-                AxisService as = axisConfig.getService(this.getName());
-                if (as != null) {
-                    as.setActive(false);
-                    axisConfig.notifyObservers(new 
AxisEvent(AxisEvent.SERVICE_STOP, as), as);
-                }
-                this.setRunning(false);
-                auditInfo("Stopped the proxy service : " + name);
-            } catch (AxisFault axisFault) {
-                handleException("Error stopping the proxy service : " + name, 
axisFault);
+            AxisService as = 
axisConfig.getServiceForActivation(this.getName());
+            if (as != null && as.isActive()) {
+                as.setActive(false);
+                axisConfig.notifyObservers(new 
AxisEvent(AxisEvent.SERVICE_STOP, as), as);
             }
+            this.setRunning(false);
+            auditInfo("Stopped the proxy service : " + name);
         } else {
             auditWarn("Unable to stop proxy service : " + name +
                 ". Couldn't access Axis configuration");