svn commit: r917618 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/SynapseConfiguration.java deployers/EventSourceDeployer.java

[ruwan]

Author: ruwan
Date: Mon Mar  1 18:00:59 2010
New Revision: 917618

URL: http://svn.apache.org/viewvc?rev=917618&view=rev
Log:
Fixing the event source remove issue

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=917618&r1=917617&r2=917618&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 Mon Mar  1 18:00:59 2010
@@ -1084,13 +1084,25 @@
      */
     public void removeEventSource(String name) {
         SynapseEventSource eventSource = eventSources.get(name);
-        if (eventSource != null) {
-            eventSources.remove(name);
-            for (SynapseObserver o : observers) {
-                o.eventSourceRemoved(eventSource);
-            }
-        } else {
+        if (eventSource == null) {
             handleException("No event source exists by the name : " + name);
+        } else {
+            try {
+                if (getAxisConfiguration().getServiceForActivation(name) != 
null) {
+                    if (getAxisConfiguration().getServiceForActivation(name)
+                            .isActive()) {
+                        getAxisConfiguration().getService(name)
+                                .setActive(false);
+                    }
+                    getAxisConfiguration().removeService(name);
+                }
+                eventSources.remove(name);
+                for (SynapseObserver o : observers) {
+                    o.eventSourceRemoved(eventSource);
+                }
+            } catch (AxisFault axisFault) {
+                handleException(axisFault.getMessage());
+            }
         }
     }
 

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java?rev=917618&r1=917617&r2=917618&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/EventSourceDeployer.java
 Mon Mar  1 18:00:59 2010
@@ -94,7 +94,6 @@
                             + "' has been built from the file " + fileName);
                 }
                 
getSynapseConfiguration().removeEventSource(existingArtifactName);
-                
getSynapseConfiguration().getAxisConfiguration().removeService(existingArtifactName);
                 if (!existingArtifactName.equals(es.getName())) {
                     log.info("EventSource named " + existingArtifactName + " 
has been Undeployed");
                 }