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

[ruwan]

Author: ruwan
Date: Mon Mar  8 08:03:19 2010
New Revision: 920224

URL: http://svn.apache.org/viewvc?rev=920224&view=rev
Log:
Fixing the proxy service adding with a service group

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=920224&r1=920223&r2=920224&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
 Mon Mar  8 08:03:19 2010
@@ -23,6 +23,7 @@
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMNode;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.description.*;
 import org.apache.axis2.engine.AxisConfiguration;
@@ -549,10 +550,9 @@
                 axisCfg.addService(proxyService);
             } else {
                 auditInfo("Adding service " + name + " to the service group " 
+ serviceGroup);
-                AxisServiceGroup proxyServiceGroup = 
axisCfg.getServiceGroup(serviceGroup);
-                if (proxyServiceGroup == null) {
+                if (axisCfg.getServiceGroup(serviceGroup) == null) {
                     // If the specified group does not exist we should create 
it
-                    proxyServiceGroup = new AxisServiceGroup();
+                    AxisServiceGroup proxyServiceGroup = new 
AxisServiceGroup();
                     proxyServiceGroup.setServiceGroupName(serviceGroup);
                     proxyServiceGroup.setParent(axisCfg);
                     // Add  the service to the new group and add the group the 
AxisConfiguration
@@ -560,7 +560,7 @@
                     axisCfg.addServiceGroup(proxyServiceGroup);
                 } else {
                     // Simply add the service to the existing group
-                    proxyServiceGroup.addService(proxyService);
+                    axisCfg.addServiceToExistingServiceGroup(proxyService, 
serviceGroup);
                 }
             }
             this.setRunning(true);