svn commit: r1510528 - in /axis/axis1/c/trunk/src/soap: SoapMethod.cpp SoapSerializer.cpp

[na...@apache.org]

Author: nadiramra
Date: Mon Aug  5 15:03:15 2013
New Revision: 1510528

URL: http://svn.apache.org/r1510528
Log:
AXISCPP-458 - unwrapped support. Fixes.

Modified:
    axis/axis1/c/trunk/src/soap/SoapMethod.cpp
    axis/axis1/c/trunk/src/soap/SoapSerializer.cpp

Modified: axis/axis1/c/trunk/src/soap/SoapMethod.cpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/soap/SoapMethod.cpp?rev=1510528&r1=1510527&r2=1510528&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/soap/SoapMethod.cpp (original)
+++ axis/axis1/c/trunk/src/soap/SoapMethod.cpp Mon Aug  5 15:03:15 2013
@@ -160,14 +160,8 @@ serialize(SoapSerializer& pSZ)
             	// We are doing non-wrapper style.  
             	
             	if (!m_OutputParams.empty())
-            	{	
-            		// Serialize parameters....
-	                
-	                // remove the current NS from the NS stack - we want the bean to define the namespace.
-            		// We could have added initial namespace to envelope, but for complex types
-            		// it seemed best to declare namespace as part of root element of xml document.
-	                pSZ.removeNamespacePrefix(m_strUri.c_str());
-	                
+            	{
+                    // Serialize parameters....
 	                iStatus= serializeOutputParam(pSZ);
 	                	                
 	                if(iStatus==AXIS_FAIL)

Modified: axis/axis1/c/trunk/src/soap/SoapSerializer.cpp
URL: http://svn.apache.org/viewvc/axis/axis1/c/trunk/src/soap/SoapSerializer.cpp?rev=1510528&r1=1510527&r2=1510528&view=diff
==============================================================================
--- axis/axis1/c/trunk/src/soap/SoapSerializer.cpp (original)
+++ axis/axis1/c/trunk/src/soap/SoapSerializer.cpp Mon Aug  5 15:03:15 2013
@@ -659,11 +659,11 @@ createSoapMethod( const AxisChar * sLoca
 	    pMethod->setPrefix( getNamespacePrefix(sURI) );
 	    pMethod->setURI( sURI);
 	    
-	    // Since we want the bean to define the namespace for non-wrapper style, we need to reset
-	    // the counter.  See SoapMethod::serialize() for further information.
+        // Add initial namespace to envelope. This needs to be added to envelop
+        // since we do not get the oppurtunity to add the namespace to the element.
 	    if (!bIsWrapperStyle)
-	        m_nCounter = 0;
-	    
+	        addNamespaceToEnvelope((AxisChar * )pMethod->getUri().c_str(), (AxisChar * )pMethod->getPrefix().c_str() );
+
 	    iStatus = AXIS_SUCCESS;
     }
 
@@ -980,15 +980,7 @@ addOutputParam( const AxisChar * pchName
         pParam->setValue(type, xsdValue);
         
         m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->addOutputParam( pParam );
-        
-        // if non-wrapper then we need to add namespace to envelope since it will not get added
-        // any other way.  non-wrapper support was added later so that is why we are in this mess.
-        if (!(m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->isWrapperStyle()))
-        {
-            addNamespaceToEnvelope((AxisChar * )m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->getUri().c_str(), 
-                                   (AxisChar * )m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->getPrefix().c_str());
-        }
-            
+
         iStatus = AXIS_SUCCESS;
     }