svn commit: r888446 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context: OperationContext.java ServiceContext.java

[ba...@apache.org]

Author: barrettj
Date: Tue Dec  8 15:41:55 2009
New Revision: 888446

URL: http://svn.apache.org/viewvc?rev=888446&view=rev
Log:
Add additional meta information for the AxisService when the Operation and Service contexts are serailized.  The additional information is used to hook up to the correct AxisService when contexts are deserialized.

Thanks to Neil Young for identifying the necessary changes.

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java?rev=888446&r1=888445&r2=888446&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/OperationContext.java Tue Dec  8 15:41:55 2009
@@ -400,8 +400,13 @@
         AxisService axisService = axisOperation.getAxisService();
 
         if (axisService != null) {
+            String serviceAndPortNames = ActivateUtils.getAxisServiceExternalizeExtraName(axisService);
+            // If there is a service & port QName stored on the AxisService then write it out so 
+            // it can be used during deserialization to hook up the message context to the 
+            // correct AxisService.
             metaAxisService =
-                    new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
+                    new MetaDataEntry(axisService.getClass().getName(), axisService.getName(),
+                            serviceAndPortNames);
         }
         out.writeObject(metaAxisService);
 

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java?rev=888446&r1=888445&r2=888446&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ServiceContext.java Tue Dec  8 15:41:55 2009
@@ -355,8 +355,13 @@
         //---------------------------------------------------------
         metaAxisService = null;
         if (axisService != null) {
+            String serviceAndPortNames = ActivateUtils.getAxisServiceExternalizeExtraName(axisService);
+            // If there is a service & port QName stored on the AxisService then write it out so 
+            // it can be used during deserialization to hook up the message context to the 
+            // correct AxisService.
             metaAxisService =
-                    new MetaDataEntry(axisService.getClass().getName(), axisService.getName());
+                    new MetaDataEntry(axisService.getClass().getName(), axisService.getName(),
+                            serviceAndPortNames);
         }
         out.writeObject(metaAxisService);