You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/02/08 10:28:37 UTC

svn commit: r375905 - in /webservices/axis2/trunk/java/modules: adb/src/org/apache/axis2/databinding/utils/BeanUtil.java core/src/org/apache/axis2/context/ConfigurationContext.java

Author: deepal
Date: Wed Feb  8 01:28:34 2006
New Revision: 375905

URL: http://svn.apache.org/viewcvs?rev=375905&view=rev
Log:
-handle application scope correctly , so if some one deploy a service in application scope no need to send the ServiceGroup Id to mange session and there will be only one instance of service impl class for whole system.

Modified:
    webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java

Modified: webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=375905&r1=375904&r2=375905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Wed Feb  8 01:28:34 2006
@@ -80,6 +80,10 @@
                 JProperty property = properties[i];
                 PropertyDescriptor propDesc = (PropertyDescriptor) propertMap.get(
                         SchemaGenerator.getCorrectName(property.getSimpleName()));
+                if (propDesc == null) {
+                    // JAM does bad thing so I need to add this
+                    continue;
+                }
                 Class ptype = propDesc.getPropertyType();
                 if (propDesc.getName().equals("class")) {
                     continue;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java?rev=375905&r1=375904&r2=375905&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/context/ConfigurationContext.java Wed Feb  8 01:28:34 2006
@@ -19,6 +19,7 @@
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
+import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.util.SessionUtils;
@@ -27,11 +28,7 @@
 import org.apache.axis2.util.threadpool.ThreadPool;
 
 import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 
 /**
  * This contains all the configuration information for Axis2.
@@ -84,8 +81,16 @@
         // by this time service group context id must have a value. Either from transport or from addressing
         ServiceGroupContext serviceGroupContext;
         ServiceContext serviceContext = messageContext.getServiceContext();
+
+        AxisService axisService = messageContext.getAxisService();
+
         if (serviceContext == null) {
-            if (!isNull(serviceGroupContextId)
+            if (Constants.SCOPE_APPLICATION.equals(axisService.getScope())) {
+                serviceGroupContext = (ServiceGroupContext) applicationSessionServiceGroupContextTabale.get(
+                        ((AxisServiceGroup) axisService.getParent()).getServiceGroupName());
+                serviceContext = serviceGroupContext.getServiceContext(axisService);
+
+            } else if (!isNull(serviceGroupContextId)
                     && (getServiceGroupContext(serviceGroupContextId, messageContext) != null)) {
 
                 // SGC is already there
@@ -130,13 +135,13 @@
                 sessionContext.addServiceContext(serviceContext);
             }
             messageContext.setServiceContext(serviceContext);
-            if(Constants.SCOPE_REQUEST.equals(maxScope)) {
+            if (Constants.SCOPE_REQUEST.equals(maxScope)) {
                 messageContext.setServiceGroupContextId(null);
             } else {
                 messageContext.setServiceGroupContext(serviceGroupContext);
             }
         }
-        if(sessionContext != null) {
+        if (sessionContext != null) {
             // when you come here operation context MUST already been assigned to the message context
             serviceContext.setProperty(Constants.COOKIE_STRING, sessionContext.getCookieID());
         }
@@ -169,7 +174,8 @@
 
     private synchronized void addServiceGroupContextintoApplicatoionScopeTable(
             ServiceGroupContext serviceGroupContext) {
-        applicationSessionServiceGroupContextTabale.put(serviceGroupContext.getId(), serviceGroupContext);
+        applicationSessionServiceGroupContextTabale.put(
+                serviceGroupContext.getDescription().getServiceGroupName(), serviceGroupContext);
     }
 
     public AxisConfiguration getAxisConfiguration() {
@@ -217,8 +223,15 @@
                     serviceGroupContextId);
         }
         if (serviceGroupContext == null) {
-            serviceGroupContext = (ServiceGroupContext)
-                    applicationSessionServiceGroupContextTabale.get(serviceGroupContextId);
+            AxisService axisService = msgContext.getAxisService();
+            if (axisService != null) {
+                AxisServiceGroup asg = (AxisServiceGroup) axisService.getParent();
+                if (asg != null) {
+                    serviceGroupContext = (ServiceGroupContext)
+                            applicationSessionServiceGroupContextTabale.get(asg.getServiceGroupName());
+                }
+            }
+
         }
 
         return serviceGroupContext;