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 ja...@apache.org on 2005/06/28 15:39:29 UTC
svn commit: r202171 - in
/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers:
AbstractMessageReceiver.java RawXMLINOutMessageReceiver.java
Author: jaliya
Date: Tue Jun 28 06:39:27 2005
New Revision: 202171
URL: http://svn.apache.org/viewcvs?rev=202171&view=rev
Log:
Corrected the AbstractMessageReceiver for SOAP version identifiction
Modified:
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java?rev=202171&r1=202170&r2=202171&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/AbstractMessageReceiver.java Tue Jun 28 06:39:27 2005
@@ -17,6 +17,10 @@
package org.apache.axis.receivers;
import org.apache.axis.Constants;
+import org.apache.axis.om.OMAbstractFactory;
+import org.apache.axis.soap.SOAPFactory;
+import org.apache.axis.soap.impl.llom.soap12.SOAP12Constants;
+import org.apache.axis.soap.impl.llom.soap11.SOAP11Constants;
import org.apache.axis.context.MessageContext;
import org.apache.axis.context.SessionContext;
import org.apache.axis.description.Parameter;
@@ -30,6 +34,8 @@
public static final String SERVICE_CLASS = "ServiceClass";
public static final String SCOPE = "scope";
+ SOAPFactory fac;
+
/**
* Method makeNewServiceObject
*
@@ -39,6 +45,16 @@
*/
protected Object makeNewServiceObject(MessageContext msgContext) throws AxisFault {
try {
+
+ String nsURI = msgContext.getEnvelope().getNamespace().getName();
+ if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
+ fac = OMAbstractFactory.getSOAP12Factory();
+ } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
+ fac = OMAbstractFactory.getSOAP11Factory();
+ }else {
+ throw new AxisFault("Unknown SOAP Version. Current Axis handles only SOAP 1.1 and SOAP 1.2 messages");
+ }
+
ServiceDescription service =
msgContext.getOperationContext().getServiceContext().getServiceConfig();
ClassLoader classLoader = service.getClassLoader();
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java?rev=202171&r1=202170&r2=202171&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/receivers/RawXMLINOutMessageReceiver.java Tue Jun 28 06:39:27 2005
@@ -71,17 +71,6 @@
throws AxisFault {
try {
- SOAPFactory fac = null;
- String nsURI = msgContext.getEnvelope().getNamespace().getName();
- if (SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
- fac = OMAbstractFactory.getSOAP12Factory();
- } else if (SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsURI)) {
- fac = OMAbstractFactory.getSOAP11Factory();
- }else {
- throw new AxisFault("Unknown SOAP Version. Current Axis handles only SOAP 1.1 and SOAP 1.2 messages");
- }
-
-
// get the implementation class for the Web Service
Object obj = getTheImplementationObject(msgContext);