svn commit: r952932 - /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java

[hi...@apache.org]

Author: hiranya
Date: Wed Jun  9 09:52:17 2010
New Revision: 952932

URL: http://svn.apache.org/viewvc?rev=952932&view=rev
Log:
Fixing SYNAPSE-660. Instead of calling loadServices on configurator we now call checkServices on repository listener. This will NOT spawn another timer task as in the previous implementation.


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

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java?rev=952932&r1=952931&r2=952932&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Axis2SynapseController.java Wed Jun  9 09:52:17 2010
@@ -20,15 +20,13 @@ package org.apache.synapse;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
+import org.apache.axis2.deployment.DeploymentEngine;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.description.*;
 import org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher;
-import org.apache.axis2.engine.AxisConfiguration;
-import org.apache.axis2.engine.Handler;
-import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.engine.Phase;
+import org.apache.axis2.engine.*;
 import org.apache.axis2.format.BinaryBuilder;
 import org.apache.axis2.format.PlainTextBuilder;
 import org.apache.axis2.phaseresolver.PhaseException;
@@ -638,7 +636,13 @@ public class Axis2SynapseController impl
      */
     private void deployMediatorExtensions() {
         log.info("Loading mediator extensions...");
-        configurationContext.getAxisConfiguration().getConfigurator().loadServices();
+        AxisConfigurator configurator = configurationContext.getAxisConfiguration().getConfigurator();
+        if (configurator instanceof DeploymentEngine) {
+            ((DeploymentEngine) configurator).getRepoListener().checkServices();
+        } else {
+            log.warn("Unable to access the repository listener. Custom extensions will " +
+                    "not get loaded now!");
+        }
     }
 
     /**