axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nadira...@apache.org
Subject svn commit: r722783 [2/2] - /webservices/axis/trunk/c/src/soap/
Date Wed, 03 Dec 2008 05:30:01 GMT
Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.cpp Tue Dec  2 21:29:56 2008
@@ -63,7 +63,7 @@
 SoapDeSerializer::
 SoapDeSerializer ()
 {
-	logEntryEngine("SoapDeSerializer::SoapDeSerializer")
+    logEntryEngine("SoapDeSerializer::SoapDeSerializer")
 
     m_pParser = XMLParserFactory::getParserObject ();
     m_pEnv = NULL;
@@ -74,13 +74,13 @@
     m_nStatus = AXIS_SUCCESS;
     m_nSoapVersion = VERSION_LAST;
     
-	logExit()
+    logExit()
 }
 
 SoapDeSerializer::
 ~SoapDeSerializer ()
 {
-	logEntryEngine("SoapDeSerializer::~SoapDeSerializer")
+    logEntryEngine("SoapDeSerializer::~SoapDeSerializer")
 
     delete m_pEnv;
     delete m_pHeader;
@@ -94,14 +94,14 @@
 int SoapDeSerializer::
 setInputStream (SOAPTransport * pInputStream)
 {
-	logEntryEngine("SoapDeSerializer::setInputStream")
+    logEntryEngine("SoapDeSerializer::setInputStream")
 
-	int iStatus = AXIS_FAIL;
-	
+    int iStatus = AXIS_FAIL;
+    
     if (NULL != pInputStream)
     {
-    	m_pInputStream = pInputStream;
-    	iStatus        = m_pParser->setInputStream (pInputStream);
+        m_pInputStream = pInputStream;
+        iStatus        = m_pParser->setInputStream (pInputStream);
     }
     
     logExitWithReturnCode(iStatus)
@@ -115,7 +115,7 @@
 void SoapDeSerializer::
 throwParserException()
 {
-	logEntryEngine("SoapDeSerializer::throwParserException")
+    logEntryEngine("SoapDeSerializer::throwParserException")
 
     AxisParseException e;
     
@@ -137,9 +137,9 @@
 int SoapDeSerializer::
 getNextNode(bool ifNotSet, bool characterMode, bool throwExcOnError)
 {
-	logSetFunctionNameEngine("SoapDeSerializer::getNextNode")
-	
-	int iStatus = AXIS_FAIL;
+    logSetFunctionNameEngine("SoapDeSerializer::getNextNode")
+    
+    int iStatus = AXIS_FAIL;
 
     // If node pointer is set and user requested that we 
     // only get next element if not set, return.
@@ -147,38 +147,38 @@
         iStatus = AXIS_SUCCESS;
     else
     {
-	    // Ensure m_pNode is NULL before calling parser in case of exceptions.
-	    m_pNode = NULL;
-	    
-	    // Just a sanity check
-	    if (m_pParser)
-		{
-		    try
-		    { 
-		        m_pNode = m_pParser->next(characterMode);
-		    }
-		    catch (AxisException &e)
-		    {
-		        // Exception processing will be handled in subsequent code
-		    }
-		    
-		    // If no node obtained, either there is no more data to read (at this time
-		    // we treat this as an error but we do not throw an exception for this) or the 
-		    // parser had an exception, in which case we throw an exception if requested.
-		    if (!m_pNode)
-		    {
-		        m_nStatus = AXIS_FAIL;
-		        if (throwExcOnError && (AXIS_FAIL == m_pParser->getStatus()))
-		            throwParserException();
-		    }
-		    else
-		    	iStatus = AXIS_SUCCESS;
-	    }
+        // Ensure m_pNode is NULL before calling parser in case of exceptions.
+        m_pNode = NULL;
+        
+        // Just a sanity check
+        if (m_pParser)
+        {
+            try
+            { 
+                m_pNode = m_pParser->next(characterMode);
+            }
+            catch (AxisException &e)
+            {
+                // Exception processing will be handled in subsequent code
+            }
+            
+            // If no node obtained, either there is no more data to read (at this time
+            // we treat this as an error but we do not throw an exception for this) or the 
+            // parser had an exception, in which case we throw an exception if requested.
+            if (!m_pNode)
+            {
+                m_nStatus = AXIS_FAIL;
+                if (throwExcOnError && (AXIS_FAIL == m_pParser->getStatus()))
+                    throwParserException();
+            }
+            else
+                iStatus = AXIS_SUCCESS;
+        }
     }
     
     if (AXIS_SUCCESS != iStatus)
     {
-    	logDebug("Status being returned is AXIS_FAIL")
+        logDebug("Status being returned is AXIS_FAIL")
     }
 
     return iStatus;
@@ -191,7 +191,7 @@
 int SoapDeSerializer::
 skipNode(bool verifyIfEndNode, bool throwExcOnError)
 {
-	logEntryEngine("SoapDeSerializer::skipNode")
+    logEntryEngine("SoapDeSerializer::skipNode")
 
     int rc = getNextNode(false, false, throwExcOnError);
     
@@ -209,7 +209,7 @@
         m_pNode = NULL;
     }
     
-	logExitWithReturnCode(rc)
+    logExitWithReturnCode(rc)
 
     return rc;
 }
@@ -217,7 +217,7 @@
 SoapEnvelope *SoapDeSerializer::
 getEnvelope ()
 {
-	logEntryEngine("SoapDeSerializer::getEnvelope")
+    logEntryEngine("SoapDeSerializer::getEnvelope")
 
     if (AXIS_FAIL == getNextNode(true))  
     {
@@ -231,7 +231,7 @@
     {
         m_nStatus = AXIS_FAIL;
         
-    	logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Start-element for SOAP Envelope not found.")
+        logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Start-element for SOAP Envelope not found.")
 
         throw AxisSoapException (CLIENT_SOAP_SOAP_CONTENT_ERROR, "Start-element for SOAP Envelope not found.");
     }
@@ -241,7 +241,7 @@
     {
         m_nStatus = AXIS_FAIL;
         
-    	logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Element is not a SOAP Envelope.")
+        logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Element is not a SOAP Envelope.")
 
         throw AxisSoapException (CLIENT_SOAP_SOAP_CONTENT_ERROR, "Element is not a SOAP Envelope.");
     }
@@ -291,12 +291,12 @@
 IHeaderBlock *SoapDeSerializer::
 getHeaderBlock (const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapDeSerializer::getHeaderBlock")
+    logEntryEngine("SoapDeSerializer::getHeaderBlock")
 
     IHeaderBlock * returnValue = NULL;
-	
+    
     if (m_pHeader)
-    	returnValue = m_pHeader->getHeaderBlock (pName, pNamespace, true);
+        returnValue = m_pHeader->getHeaderBlock (pName, pNamespace, true);
     
     logExitWithPointer(returnValue)
 
@@ -306,11 +306,11 @@
 int SoapDeSerializer::
 getHeader ()
 {
-	logEntryEngine("SoapDeSerializer::getHeader")
+    logEntryEngine("SoapDeSerializer::getHeader")
 
     if (m_pHeader || AXIS_FAIL == getNextNode())
     {
-    	logExitWithReturnCode(m_nStatus)
+        logExitWithReturnCode(m_nStatus)
 
         return m_nStatus;
     }
@@ -432,7 +432,7 @@
         }
     }
 
-	logExitWithReturnCode(m_nStatus)
+    logExitWithReturnCode(m_nStatus)
 
     return m_nStatus;
 }
@@ -441,14 +441,14 @@
 const char*SoapDeSerializer::
 peekNextElementName ()
 { 
-	logEntryEngine("SoapDeSerializer::peekNextElementName")
+    logEntryEngine("SoapDeSerializer::peekNextElementName")
 
     const char*name = NULL;
-	
+    
     if (m_pParser)
         name = m_pParser->peek ();
             
-	logExitWithString(name)
+    logExitWithString(name)
 
     return name;
 }
@@ -456,30 +456,30 @@
 int SoapDeSerializer::
 getBody ()
 {
-	logEntryEngine("SoapDeSerializer::getBody")
+    logEntryEngine("SoapDeSerializer::getBody")
 
-	int iStatus = AXIS_FAIL;
-	
+    int iStatus = AXIS_FAIL;
+    
     if (AXIS_FAIL == getNextNode(true))
-    	iStatus = m_nStatus;
+        iStatus = m_nStatus;
     else
     {
-	    // previous header searching may have left a node unidentified
-	    if ((START_ELEMENT == m_pNode->m_type) 
-	            && (m_nSoapVersion != VERSION_LAST)
-	            && (0 == strcmp (m_pNode->m_pchNameOrValue,SoapKeywordMapping::map (m_nSoapVersion).pchWords[SKW_BODY])))
-	    {
-	        // indicate node consumed
-	        m_pNode = NULL; 
-	
-	        // peek for the method name
-	        m_strMethodNameToInvoke = m_pParser->peek();
-	        
-	        iStatus = AXIS_SUCCESS;
-	    }
+        // previous header searching may have left a node unidentified
+        if ((START_ELEMENT == m_pNode->m_type) 
+                && (m_nSoapVersion != VERSION_LAST)
+                && (0 == strcmp (m_pNode->m_pchNameOrValue,SoapKeywordMapping::map (m_nSoapVersion).pchWords[SKW_BODY])))
+        {
+            // indicate node consumed
+            m_pNode = NULL; 
+    
+            // peek for the method name
+            m_strMethodNameToInvoke = m_pParser->peek();
+            
+            iStatus = AXIS_SUCCESS;
+        }
     }
 
-	logExitWithReturnCode(iStatus)
+    logExitWithReturnCode(iStatus)
 
     return iStatus;
 }
@@ -487,45 +487,45 @@
 int SoapDeSerializer::
 checkMessageBody (const AxisChar * pName, const AxisChar * pNamespace)
 {
-	return validateMessageBody(pName, pNamespace, true);
+    return validateMessageBody(pName, pNamespace, true);
 }
 
 int SoapDeSerializer::
 validateMessageBody(const AxisChar * pName, const AxisChar * pNamespace, bool consumeIt)
 {
-	logEntryEngine("SoapDeSerializer::validateMessageBody")
+    logEntryEngine("SoapDeSerializer::validateMessageBody")
 
-	int iStatus = AXIS_FAIL;
-	
+    int iStatus = AXIS_FAIL;
+    
     // Will throw exception if failure in parser
     if (AXIS_FAIL != getNextNode(true))
     {
-	    if (START_ELEMENT != m_pNode->m_type)
-	    {
-	    	logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Start-element was not found.")
-
-	        throw AxisSoapException (CLIENT_SOAP_SOAP_CONTENT_ERROR, "Start-element was not found.");
-	    }
-	
-	    // If a fault has occurred or the node name is unexpected, throw exception
-	    // deserialize it as doc literal by setting style. 
-	    if (0 != strcmp (m_pNode->m_pchNameOrValue, pName))
-	    {
-	        setStyle (DOC_LITERAL);
-	        
-	        logThrowException("AxisGenException - AXISC_NODE_VALUE_MISMATCH_EXCEPTION")
-	        		
-	        throw AxisGenException (AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
-	    }
-	
-	    // indicate node consumed
-	    if (consumeIt)
-	    	m_pNode = NULL; 
-	    
-	    iStatus = AXIS_SUCCESS;
+        if (START_ELEMENT != m_pNode->m_type)
+        {
+            logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Start-element was not found.")
+
+            throw AxisSoapException (CLIENT_SOAP_SOAP_CONTENT_ERROR, "Start-element was not found.");
+        }
+    
+        // If a fault has occurred or the node name is unexpected, throw exception
+        // deserialize it as doc literal by setting style. 
+        if (0 != strcmp (m_pNode->m_pchNameOrValue, pName))
+        {
+            setStyle (DOC_LITERAL);
+            
+            logThrowException("AxisGenException - AXISC_NODE_VALUE_MISMATCH_EXCEPTION")
+                    
+            throw AxisGenException (AXISC_NODE_VALUE_MISMATCH_EXCEPTION);
+        }
+    
+        // indicate node consumed
+        if (consumeIt)
+            m_pNode = NULL; 
+        
+        iStatus = AXIS_SUCCESS;
     }
     
-	logExitWithReturnCode(iStatus)
+    logExitWithReturnCode(iStatus)
 
     return iStatus;
 }
@@ -534,32 +534,32 @@
 void SoapDeSerializer::
 initiateFault (const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapDeSerializer::initiateFault")
+    logEntryEngine("SoapDeSerializer::initiateFault")
 
     // Will throw exception if failure in parser
     if (AXIS_FAIL != getNextNode(true))
     {
-	    if (START_ELEMENT != m_pNode->m_type)
-	    {
-	    	logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Start-element was not found.")
-	    	
-	        throw AxisSoapException (CLIENT_SOAP_SOAP_CONTENT_ERROR, "Start-element was not found.");
-	    }
-	
-	    setStyle (DOC_LITERAL);
-	    
+        if (START_ELEMENT != m_pNode->m_type)
+        {
+            logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_SOAP_CONTENT_ERROR", "Start-element was not found.")
+            
+            throw AxisSoapException (CLIENT_SOAP_SOAP_CONTENT_ERROR, "Start-element was not found.");
+        }
+    
+        setStyle (DOC_LITERAL);
+        
         logThrowException("AxisGenException - AXISC_NODE_VALUE_MISMATCH_EXCEPTION")
 
-	    throw AxisGenException (AXISC_NODE_VALUE_MISMATCH_EXCEPTION); 
+        throw AxisGenException (AXISC_NODE_VALUE_MISMATCH_EXCEPTION); 
     }
-	
-	logExit()
+    
+    logExit()
 }
 
 void *SoapDeSerializer::
 checkForFault (const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapDeSerializer::checkForFault")
+    logEntryEngine("SoapDeSerializer::checkForFault")
 
     if (0 != strcmp ("Fault", pName))
     {
@@ -666,7 +666,7 @@
 int SoapDeSerializer::
 init ()
 {
-	logEntryEngine("SoapDeSerializer::init")
+    logEntryEngine("SoapDeSerializer::init")
 
     m_pNode = NULL;
     m_pCurrNode = NULL;
@@ -680,7 +680,7 @@
     m_nSoapVersion = VERSION_LAST;
     m_nStatus = AXIS_SUCCESS;
 
-	logExitWithReturnCode(m_nStatus)
+    logExitWithReturnCode(m_nStatus)
 
     return m_nStatus;
 }
@@ -688,7 +688,7 @@
 int SoapDeSerializer::
 getVersion ()
 {
-	logEntryEngine("SoapDeSerializer::getVersion")
+    logEntryEngine("SoapDeSerializer::getVersion")
 
     if (VERSION_LAST == m_nSoapVersion)
     {
@@ -697,8 +697,8 @@
         m_pEnv = getEnvelope ();
     }
 
-	logExitWithInteger(m_nSoapVersion)
-	
+    logExitWithInteger(m_nSoapVersion)
+    
     return m_nSoapVersion;
 }
 
@@ -710,16 +710,16 @@
 int SoapDeSerializer::
 getArraySize ()
 {
-	logEntryEngine("SoapDeSerializer::getArraySize")
+    logEntryEngine("SoapDeSerializer::getArraySize")
 
     int nSize = 0;
     
     // If not RPC or failure in getNextNode, return zero.
     if (RPC_ENCODED != m_nStyle || (AXIS_FAIL == getNextNode()))
     {
-    	logExitWithInteger(nSize)
+        logExitWithInteger(nSize)
 
-    	return nSize;
+        return nSize;
     }
     
     // first check whether this is a start element node
@@ -730,14 +730,14 @@
         {
             skipNode();
             
-        	logExitWithInteger(nSize)
+            logExitWithInteger(nSize)
 
             return nSize;
         }
     }
     else if (END_ELEMENT == m_pNode->m_type)
     {
-    	logExitWithInteger(nSize)
+        logExitWithInteger(nSize)
 
         return nSize;
     }
@@ -757,13 +757,13 @@
             if (nSize == 0)
                 skipNode();
                 
-        	logExitWithInteger(nSize)
+            logExitWithInteger(nSize)
 
             return nSize;
         }
     }
 
-	logExitWithInteger(nSize)
+    logExitWithInteger(nSize)
 
     return nSize;
 }
@@ -788,38 +788,38 @@
                void *pDZFunct, void *pCreFunct, void *pDelFunct, 
                const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapDeSerializer::getCmplxArray")
+    logEntryEngine("SoapDeSerializer::getCmplxArray")
 
     // if anything has gone wrong earlier just do nothing 
     if (AXIS_SUCCESS == m_nStatus)
     {
-	    // Loop through the array adding elements.
-	    int arraySize = getArraySize ();    
-	    int count = 0;
-	    const char* elementName;
-	    
-	    while(RPC_ENCODED != m_nStyle || count < arraySize)
-	    {
-	        // For RPC-encoded arrays, the element name in array cannot be derived - 
-	        // within an array value element names are not significant - so  
-	        // we read until end-of-element is encountered (i.e. null string 
-	        // is returned from peek()). 
-	        elementName = m_pParser->peek();
-	        if ((RPC_ENCODED == m_nStyle && 0x00 != *elementName) || strcmp(elementName, pName) == 0)
-	            pArray->addElement(getCmplxObject(pDZFunct, pCreFunct, pDelFunct, pName, pNamespace));
-	        else
-	            break;    
-	            
-	        ++count;    
-	    }
-	    
-	    if (AXIS_FAIL == m_nStatus) // TODO - not sure this line is needed
-	        m_pNode = NULL;         // TODO - not sure this line is needed
-	    else if (arraySize > 0)
-	        skipNode();
+        // Loop through the array adding elements.
+        int arraySize = getArraySize ();    
+        int count = 0;
+        const char* elementName;
+        
+        while(RPC_ENCODED != m_nStyle || count < arraySize)
+        {
+            // For RPC-encoded arrays, the element name in array cannot be derived - 
+            // within an array value element names are not significant - so  
+            // we read until end-of-element is encountered (i.e. null string 
+            // is returned from peek()). 
+            elementName = m_pParser->peek();
+            if ((RPC_ENCODED == m_nStyle && 0x00 != *elementName) || strcmp(elementName, pName) == 0)
+                pArray->addElement(getCmplxObject(pDZFunct, pCreFunct, pDelFunct, pName, pNamespace));
+            else
+                break;    
+                
+            ++count;    
+        }
+        
+        if (AXIS_FAIL == m_nStatus) // TODO - not sure this line is needed
+            m_pNode = NULL;         // TODO - not sure this line is needed
+        else if (arraySize > 0)
+            skipNode();
     }
         
-	logExitWithPointer(pArray)
+    logExitWithPointer(pArray)
 
     return pArray;
 }
@@ -842,7 +842,7 @@
 Axis_Array*SoapDeSerializer::
 getBasicArray (XSDTYPE nType, const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapDeSerializer::getBasicArray")
+    logEntryEngine("SoapDeSerializer::getBasicArray")
 
     int size = 0;      
     Axis_Array* Array = new Axis_Array();
@@ -851,75 +851,75 @@
     // if anything has gone wrong earlier just do nothing
     if (AXIS_SUCCESS == m_nStatus)
     {
-	    // Loop through the array adding elements.
-	    IAnySimpleType* pSimpleType = NULL;
-	    void * pValue = NULL;
-	    
-	    try
-	    {
-	        size = getArraySize ();
-	        const char* elementName;
-	        int count = 0;
-	                
-	        while(RPC_ENCODED != m_nStyle || count < size)
-	        {
-	            // For RPC-encoded arrays, the element name in array cannot be derived - 
-	            // within an array value element names are not significant -   
-	            // so we read until end-of-element is encountered (i.e. null string 
-	            // is returned from peek()). 
-	            elementName = m_pParser->peek();
-	            if ((RPC_ENCODED == m_nStyle && 0x00 != *elementName) || strcmp(elementName, pName) == 0)
-	            {
-	            	// TODO instead of deleting the pointer use it by by-passing addElement().
-	            	if (XSD_ANYTYPE != nType)
-	            	{
-		                if (0 == count)
-		                    pSimpleType = AxisUtils::createSimpleTypeObject(nType);
-		                getElement(pName, pNamespace, pSimpleType, (bool)(RPC_ENCODED == m_nStyle));
-		                pValue = pSimpleType->getValue();
-		                Array->addElement(pValue);
-		                Axis::AxisDelete(pValue, pSimpleType->getType());
-	            	}
-	            	else
-	            	{
-	            		pValue = getElementAsAnyType(pName, pNamespace);
-	            		Array->addElement(pValue);
-	            		Axis::AxisDelete(pValue, XSD_ANYTYPE);
-	            	}
-	            	
-	                pValue = NULL;
-	            }
-	            else
-	                break;
-	                
-	            ++count;
-	        }             
-	    }
-	    catch ( ... )
-	    {
-	        if (pSimpleType)
-	        { 
-	            if (pValue)
-	                Axis::AxisDelete(pValue, pSimpleType->getType());
-	            delete pSimpleType;
-	        }
-	        
-	        delete Array;
-	        
-	        logRethrowException()
-	        
-	        throw;
-	    }
-	    
-	    delete pSimpleType;
-	    
-	    if (AXIS_FAIL == m_nStatus) // TODO - not sure this line is needed
-	        m_pNode = NULL;         // TODO - not sure this line is needed
-	    else if (size > 0)
-	        skipNode();
+        // Loop through the array adding elements.
+        IAnySimpleType* pSimpleType = NULL;
+        void * pValue = NULL;
+        
+        try
+        {
+            size = getArraySize ();
+            const char* elementName;
+            int count = 0;
+                    
+            while(RPC_ENCODED != m_nStyle || count < size)
+            {
+                // For RPC-encoded arrays, the element name in array cannot be derived - 
+                // within an array value element names are not significant -   
+                // so we read until end-of-element is encountered (i.e. null string 
+                // is returned from peek()). 
+                elementName = m_pParser->peek();
+                if ((RPC_ENCODED == m_nStyle && 0x00 != *elementName) || strcmp(elementName, pName) == 0)
+                {
+                    // TODO instead of deleting the pointer use it by by-passing addElement().
+                    if (XSD_ANYTYPE != nType)
+                    {
+                        if (0 == count)
+                            pSimpleType = AxisUtils::createSimpleTypeObject(nType);
+                        getElement(pName, pNamespace, pSimpleType, (bool)(RPC_ENCODED == m_nStyle));
+                        pValue = pSimpleType->getValue();
+                        Array->addElement(pValue);
+                        Axis::AxisDelete(pValue, pSimpleType->getType());
+                    }
+                    else
+                    {
+                        pValue = getElementAsAnyType(pName, pNamespace);
+                        Array->addElement(pValue);
+                        Axis::AxisDelete(pValue, XSD_ANYTYPE);
+                    }
+                    
+                    pValue = NULL;
+                }
+                else
+                    break;
+                    
+                ++count;
+            }             
+        }
+        catch ( ... )
+        {
+            if (pSimpleType)
+            { 
+                if (pValue)
+                    Axis::AxisDelete(pValue, pSimpleType->getType());
+                delete pSimpleType;
+            }
+            
+            delete Array;
+            
+            logRethrowException()
+            
+            throw;
+        }
+        
+        delete pSimpleType;
+        
+        if (AXIS_FAIL == m_nStatus) // TODO - not sure this line is needed
+            m_pNode = NULL;         // TODO - not sure this line is needed
+        else if (size > 0)
+            skipNode();
     }
     
-	logExitWithPointer(Array)
+    logExitWithPointer(Array)
 
     return Array;    
 }
@@ -943,13 +943,13 @@
 getCmplxObject (void *pDZFunct, void *pCreFunct, void *pDelFunct, 
                 const AxisChar * pName, const AxisChar * pNamespace, bool isFault)
 {
-	logEntryEngine("SoapDeSerializer::getCmplxObject")
+    logEntryEngine("SoapDeSerializer::getCmplxObject")
 
     if (!isFault)
     {
         if (AXIS_SUCCESS != m_nStatus || (AXIS_FAIL == getNextNode(RPC_ENCODED != m_nStyle)))
         {
-        	logExitWithPointer(NULL)
+            logExitWithPointer(NULL)
 
             return NULL;  
         }
@@ -964,7 +964,7 @@
              * null value or none filled value. Some Web services servers work
              * like this. This apply for all the rest of the deserializer.
              */
-        	logExitWithPointer(NULL)
+            logExitWithPointer(NULL)
 
             return NULL;            
         }
@@ -979,7 +979,7 @@
     {
         skipNode();
         
-    	logExitWithPointer(NULL)
+        logExitWithPointer(NULL)
 
         return NULL;
     }
@@ -994,7 +994,7 @@
     
     if (!isFault && AXIS_FAIL == m_nStatus)  
     {
-    	logExitWithPointer(NULL)
+        logExitWithPointer(NULL)
 
         return NULL;  
     }
@@ -1046,7 +1046,7 @@
         }
     }
 
-	logExitWithPointer(pObject)
+    logExitWithPointer(pObject)
 
     return pObject;
 }
@@ -1054,10 +1054,10 @@
 void * SoapDeSerializer::
 getAttribute(const AxisChar* pName, const AxisChar * pNamespace, IAnySimpleType * pSimpleType)
 {
-	logEntryEngine("SoapDeSerializer::getAttribute")
+    logEntryEngine("SoapDeSerializer::getAttribute")
 
     void *returnValue = NULL;
-	
+    
     if (m_pCurrNode)
     {
         for (int i=0; m_pCurrNode->m_pchAttributes[i]; i += 3)
@@ -1071,7 +1071,7 @@
         }
     }
     
-	logExitWithPointer(returnValue)
+    logExitWithPointer(returnValue)
 
     return returnValue;
 }
@@ -1387,7 +1387,7 @@
 bool SoapDeSerializer::
 isNilValue()
 {
-	logEntryEngine("SoapDeSerializer::isNilValue")
+    logEntryEngine("SoapDeSerializer::isNilValue")
 
     bool isNillResult = false;    
 
@@ -1414,7 +1414,7 @@
 void SoapDeSerializer::
 processFaultDetail(IAnySimpleType * pSimpleType, const AxisChar* elementValue)
 {
-	logEntryEngine("SoapDeSerializer::processFaultDetail")
+    logEntryEngine("SoapDeSerializer::processFaultDetail")
 
     bool isWhiteSpace = true;
     
@@ -1466,19 +1466,19 @@
             IAnySimpleType * pSimpleType,
             bool isArrayElement)
 {  
-	logEntryEngine("SoapDeSerializer::getElement")
+    logEntryEngine("SoapDeSerializer::getElement")
 
     if (AXIS_SUCCESS != m_nStatus)
     {
-    	logExit()
-    	
+        logExit()
+        
         return;
     }
         
     if (AXIS_FAIL == getNextNode(RPC_ENCODED != m_nStyle))
     {
-    	logExit()
-    	
+        logExit()
+        
         return;
     }
 
@@ -1496,24 +1496,24 @@
     }
     else if (0 != strcmp (pName, m_pNode->m_pchNameOrValue))
     {
-    	logExit()
-    	
-    	return;
+        logExit()
+        
+        return;
     }
     
     if (AXIS_FAIL == m_nStatus)
     {
-    	logExit()
-    	
+        logExit()
+        
         return;
     }
     
     // get next element, character mode 
     if (AXIS_FAIL == getNextNode(false, true))
     {
-    	logExit()
-    	
-    	return;
+        logExit()
+        
+        return;
     }
       
     if (CHARACTER_ELEMENT == m_pNode->m_type)
@@ -1915,13 +1915,13 @@
     AnyType *any = getAnyObject();
     if (NULL != any)
     {
-	    if (any->_size != 0)
-	    {
-	    	ret = any->_array[0];
-	    	any->_array[0] = NULL;
-	        delete [] any->_array;
-	    }
-	    delete any;
+        if (any->_size != 0)
+        {
+            ret = any->_array[0];
+            any->_array[0] = NULL;
+            delete [] any->_array;
+        }
+        delete any;
     }
     
     return ret;
@@ -1942,11 +1942,11 @@
     xsd__string ret = new char[len];
     memset(ret,0,len);
     for (i=0; i<any->_size; i++) 
-    	if (any->_array[i]) 
-	    {
-	        strcat(ret,any->_array[i]);
-	        delete [] any->_array[i];
-	    }
+        if (any->_array[i]) 
+        {
+            strcat(ret,any->_array[i]);
+            delete [] any->_array[i];
+        }
     delete [] any->_array;
     delete any;
     return ret;
@@ -1962,29 +1962,29 @@
 {
     foundType = false;
     
-	XSDTYPE type = XSD_UNKNOWN;
-	
+    XSDTYPE type = XSD_UNKNOWN;
+    
     /* first check whether this is a start element node */
     if (START_ELEMENT == pElement->m_type)
     {
-	    for (int i = 0; pElement->m_pchAttributes[i]; i += 3)
-	    {
-	        if (URI_XSI == URIMapping::getURI (pElement->m_pchAttributes[i + 1]))
-	        {
-	            ::QName qn;
-	            
-	            qn.splitQNameString (pElement->m_pchAttributes[i + 2], ':');
-	            const char * pNS = m_pParser->getNS4Prefix (qn.uri);
-	            if (pNS)
-	            {
-	                if (URI_XSD == URIMapping::getURI (pNS) || URI_ENC == URIMapping::getURI (pNS))
-	                    type = TypeMapping::map (qn.localname);
-	            }
-	            qn.mergeQNameString (':');
-	            foundType = true;
-	            break;
-	        }
-	    }
+        for (int i = 0; pElement->m_pchAttributes[i]; i += 3)
+        {
+            if (URI_XSI == URIMapping::getURI (pElement->m_pchAttributes[i + 1]))
+            {
+                ::QName qn;
+                
+                qn.splitQNameString (pElement->m_pchAttributes[i + 2], ':');
+                const char * pNS = m_pParser->getNS4Prefix (qn.uri);
+                if (pNS)
+                {
+                    if (URI_XSD == URIMapping::getURI (pNS) || URI_ENC == URIMapping::getURI (pNS))
+                        type = TypeMapping::map (qn.localname);
+                }
+                qn.mergeQNameString (':');
+                foundType = true;
+                break;
+            }
+        }
     }
 
     return type;
@@ -1999,12 +1999,12 @@
 HeaderBlock * SoapDeSerializer::
 getHeaderBlock ()
 {
-	logEntryEngine("SoapDeSerializer::getHeaderBlock")
+    logEntryEngine("SoapDeSerializer::getHeaderBlock")
 
     HeaderBlock *returnValue = NULL;
-	
+    
     if (m_pHeader)
-    	returnValue = (HeaderBlock *) m_pHeader->getHeaderBlock (true);
+        returnValue = (HeaderBlock *) m_pHeader->getHeaderBlock (true);
     
     logExitWithPointer(returnValue)
     
@@ -2018,7 +2018,7 @@
 int AXISCALL SoapDeSerializer::
 addHeaderBlock (IHeaderBlock * pBlk)
 {
-	logEntryEngine("SoapDeSerializer::addHeaderBlock")
+    logEntryEngine("SoapDeSerializer::addHeaderBlock")
 
     if (!m_pHeader)
         m_pHeader = new SoapHeader ();
@@ -2137,7 +2137,7 @@
 int SoapDeSerializer::
 flushInputStream ()
 {
-	logEntryEngine("SoapDeSerializer::flushInputStream")
+    logEntryEngine("SoapDeSerializer::flushInputStream")
 
     int iStatus = AXIS_FAIL;
     
@@ -2146,8 +2146,8 @@
         int nChars = 100;
         char pBuffer[100];
         
-    	while (TRANSPORT_IN_PROGRESS == m_pInputStream->getBytes (pBuffer, &nChars));
-    	iStatus = AXIS_SUCCESS;
+        while (TRANSPORT_IN_PROGRESS == m_pInputStream->getBytes (pBuffer, &nChars));
+        iStatus = AXIS_SUCCESS;
     }
     
     logExitWithReturnCode(iStatus)
@@ -2158,109 +2158,109 @@
 AnyType * SoapDeSerializer::
 getAnyObject ()
 {
-	logEntryEngine("SoapDeSerializer::getAnyObject")
+    logEntryEngine("SoapDeSerializer::getAnyObject")
 
     // Parser will throw an exception on a parser exception, that is ok...
     if (!m_pNode)
         m_pNode = m_pParser->anyNext();
-	
-	AnyType *pAny = NULL;
-	
+    
+    AnyType *pAny = NULL;
+    
     if (m_pNode)
-	{    
-	    int tagCount = 0;
-	    int lstSize = 0;
-	    bool bContinue = false;
-	
-	    AxisString xmlStr = "";
-	    AxisString nsDecls = "";
-	
-	    list < AxisString > lstXML;
-	
-		AxisString inValue = "";
-		AxisString outValue = "";
-	
-	    while ((END_ELEMENT != m_pNode->m_type) || (tagCount >= 0) || bContinue)
-	    {
-	        // Continue if processing start prefix,
-	        // as we haven't yet found the true start of the tag
-	        if (START_PREFIX == m_pNode->m_type)
-	            bContinue = true;
-	        else
-	            bContinue = false;
-	        
-	        // Increment counter if entering new tag, Decrement counter if exiting tag
-	        if (START_ELEMENT == m_pNode->m_type && START_END_ELEMENT != m_pNode->m_type2)
-	            tagCount++;
-	        else if (END_ELEMENT == m_pNode->m_type)
-	            tagCount--;
-	
-	        if (START_PREFIX == m_pNode->m_type)
-	        {
-	            nsDecls += " xmlns";
-	            if (m_pNode->m_pchNameOrValue && (*(m_pNode->m_pchNameOrValue) != 0x00))
-	            {
-	                nsDecls += ":";
-	                nsDecls += m_pNode->m_pchNameOrValue;
-	            }
-	            nsDecls += "=\"";
-	            nsDecls += m_pNode->m_pchNamespace;
-	            nsDecls += "\"";
-	        }
-	        else if (CHARACTER_ELEMENT != m_pNode->m_type)
-	        {
-	            serializeTag (xmlStr, m_pNode, nsDecls);
-	            nsDecls = "";
-	        }
-	        else
-	        {
-	        	inValue = m_pNode->m_pchNameOrValue;
-	        	IAnySimpleType::replaceReservedCharacters(inValue, outValue);
-	            xmlStr += outValue;
-	        }
-	    
-	        if ( !bContinue && tagCount == 0 && (!xmlStr.empty ()))    /* copying the First level element into the list */
-	        {
-	            lstXML.push_back (xmlStr);
-	            xmlStr = "";
-	            m_pNode = NULL;
-	            break;
-	        }
-	    
-	        m_pNode = m_pParser->anyNext ();
-	    
-	        if (!m_pNode) // there is something wrong in the XSD Any XML stream
-	        {          
-	            // Store whatever we have by now and break
-	            if (!xmlStr.empty ())
-	            {
-	                lstXML.push_back (xmlStr);
-	                xmlStr = "";
-	            }
-	            break;
-	        }
-	    }
-	
-	    pAny = new AnyType ();
-	    pAny->_array = 0;
-	    pAny->_size = 0;
-	    
-	    lstSize = lstXML.size ();
-	    
-	    if (lstSize > 0)
-	    {
-	        pAny->_array = new char *[lstSize];
-	
-	        list < AxisString >::iterator i;    /* Iterator for traversing the list */
-	    
-	        for (i = lstXML.begin (); i != lstXML.end (); i++)
-	        {
-	            const char *s = (*i).c_str ();
-	            pAny->_array[pAny->_size] = new char[strlen (s) + 1];
-	            strcpy (pAny->_array[pAny->_size], s);
-	            pAny->_size++;
-	        }
-	    }
+    {    
+        int tagCount = 0;
+        int lstSize = 0;
+        bool bContinue = false;
+    
+        AxisString xmlStr = "";
+        AxisString nsDecls = "";
+    
+        list < AxisString > lstXML;
+    
+        AxisString inValue = "";
+        AxisString outValue = "";
+    
+        while ((END_ELEMENT != m_pNode->m_type) || (tagCount >= 0) || bContinue)
+        {
+            // Continue if processing start prefix,
+            // as we haven't yet found the true start of the tag
+            if (START_PREFIX == m_pNode->m_type)
+                bContinue = true;
+            else
+                bContinue = false;
+            
+            // Increment counter if entering new tag, Decrement counter if exiting tag
+            if (START_ELEMENT == m_pNode->m_type && START_END_ELEMENT != m_pNode->m_type2)
+                tagCount++;
+            else if (END_ELEMENT == m_pNode->m_type)
+                tagCount--;
+    
+            if (START_PREFIX == m_pNode->m_type)
+            {
+                nsDecls += " xmlns";
+                if (m_pNode->m_pchNameOrValue && (*(m_pNode->m_pchNameOrValue) != 0x00))
+                {
+                    nsDecls += ":";
+                    nsDecls += m_pNode->m_pchNameOrValue;
+                }
+                nsDecls += "=\"";
+                nsDecls += m_pNode->m_pchNamespace;
+                nsDecls += "\"";
+            }
+            else if (CHARACTER_ELEMENT != m_pNode->m_type)
+            {
+                serializeTag (xmlStr, m_pNode, nsDecls);
+                nsDecls = "";
+            }
+            else
+            {
+                inValue = m_pNode->m_pchNameOrValue;
+                IAnySimpleType::replaceReservedCharacters(inValue, outValue);
+                xmlStr += outValue;
+            }
+        
+            if ( !bContinue && tagCount == 0 && (!xmlStr.empty ()))    /* copying the First level element into the list */
+            {
+                lstXML.push_back (xmlStr);
+                xmlStr = "";
+                m_pNode = NULL;
+                break;
+            }
+        
+            m_pNode = m_pParser->anyNext ();
+        
+            if (!m_pNode) // there is something wrong in the XSD Any XML stream
+            {          
+                // Store whatever we have by now and break
+                if (!xmlStr.empty ())
+                {
+                    lstXML.push_back (xmlStr);
+                    xmlStr = "";
+                }
+                break;
+            }
+        }
+    
+        pAny = new AnyType ();
+        pAny->_array = 0;
+        pAny->_size = 0;
+        
+        lstSize = lstXML.size ();
+        
+        if (lstSize > 0)
+        {
+            pAny->_array = new char *[lstSize];
+    
+            list < AxisString >::iterator i;    /* Iterator for traversing the list */
+        
+            for (i = lstXML.begin (); i != lstXML.end (); i++)
+            {
+                const char *s = (*i).c_str ();
+                pAny->_array[pAny->_size] = new char[strlen (s) + 1];
+                strcpy (pAny->_array[pAny->_size], s);
+                pAny->_size++;
+            }
+        }
     }
 
     logExitWithPointer(pAny)
@@ -2418,18 +2418,18 @@
 void SoapDeSerializer::
 getChardataAs (void **pValue, XSDTYPE type)
 {  
-	logEntryEngine("SoapDeSerializer::getChardataAs")
+    logEntryEngine("SoapDeSerializer::getChardataAs")
 
     if (pValue && AXIS_FAIL != getNextNode(true, true))
     {
-	    *pValue = NULL;
-	    if (CHARACTER_ELEMENT == m_pNode->m_type)
-	    {
-	        IAnySimpleType* pSimpleType = AxisUtils::createSimpleTypeObject(type);
-	        pSimpleType->deserialize(m_pNode->m_pchNameOrValue);
-	        *pValue = pSimpleType->getValue();
-	        delete pSimpleType;
-	    }
+        *pValue = NULL;
+        if (CHARACTER_ELEMENT == m_pNode->m_type)
+        {
+            IAnySimpleType* pSimpleType = AxisUtils::createSimpleTypeObject(type);
+            pSimpleType->deserialize(m_pNode->m_pchNameOrValue);
+            *pValue = pSimpleType->getValue();
+            delete pSimpleType;
+        }
     }
     
     logExit()
@@ -2447,19 +2447,19 @@
 DeSerializerMemBufInputStream::
 getBytes (char *pcBuffer, int *piRetSize)
 {
-	logEntryEngine("SoapDeSerializer::DeSerializerMemBufInputStream::getBytes")
+    logEntryEngine("SoapDeSerializer::DeSerializerMemBufInputStream::getBytes")
 
     if (!m_pcDeSeriaMemBuffer)
     {
-    	logExitWithMessage("Returned return code of TRANSPORT_FAILED")
-    	
+        logExitWithMessage("Returned return code of TRANSPORT_FAILED")
+        
         return TRANSPORT_FAILED;
     }
         
     int nBufLen = strlen (m_pcDeSeriaMemBuffer);
     if (0 == nBufLen)
     {
-    	logExitWithMessage("Returned return code of TRANSPORT_FINISHED")
+        logExitWithMessage("Returned return code of TRANSPORT_FINISHED")
 
         return TRANSPORT_FINISHED;
     }
@@ -2469,7 +2469,7 @@
     pcBuffer[nBufLen] = 0;
     m_pcDeSeriaMemBuffer += nBufLen;
     
-	logExitWithMessage("Returned return code of TRANSPORT_IN_PROGRESS")
+    logExitWithMessage("Returned return code of TRANSPORT_IN_PROGRESS")
 
     return TRANSPORT_IN_PROGRESS;
 }
@@ -2495,10 +2495,10 @@
 void SoapDeSerializer::
 setMethodNameToInvoke(const char* methodName)
 {
-	logEntryEngine("SoapDeSerializer::setMethodNameToInvoke")
+    logEntryEngine("SoapDeSerializer::setMethodNameToInvoke")
 
     m_strMethodNameToInvoke = methodName;
-	
+    
     logExit()
 }
 

Modified: webservices/axis/trunk/c/src/soap/SoapDeSerializer.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapDeSerializer.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapDeSerializer.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapDeSerializer.h Tue Dec  2 21:29:56 2008
@@ -72,13 +72,13 @@
     const char* getMethodNameToInvoke();
     void setMethodNameToInvoke(const char*);
     
-	/**
-	* This method allows to peek for the name of the next element in XML stream.
-	* Useful in supporting "all" & "choice" WSDL constructs.
-	* @return Name of the next element in XML stream 
-	*/
-	const char* peekNextElementName(); 
-	
+    /**
+    * This method allows to peek for the name of the next element in XML stream.
+    * Useful in supporting "all" & "choice" WSDL constructs.
+    * @return Name of the next element in XML stream 
+    */
+    const char* peekNextElementName(); 
+    
     int flushInputStream();
     PROVIDERTYPE getCurrentProviderType() { return m_ProviderType;};
     void setCurrentProviderType(PROVIDERTYPE nType) { m_ProviderType = nType;};
@@ -210,7 +210,7 @@
     xsd__anyType AXISCALL getElementAsAnyType(const AxisChar* pName,
         const AxisChar* pNamespace);
 
-	void *getAttribute(const AxisChar* pName, const AxisChar* pNamespace,
+    void *getAttribute(const AxisChar* pName, const AxisChar* pNamespace,
         IAnySimpleType* pSimpleType);
     xsd__int * AXISCALL getAttributeAsInt(const AxisChar* pName, 
         const AxisChar* pNamespace);
@@ -304,7 +304,7 @@
     void setStyle(AXIS_BINDING_STYLE nStyle){ m_nStyle = nStyle;};
     AXIS_BINDING_STYLE getStyle(){return m_nStyle;};    
     int AXISCALL getStatus(){return m_nStatus;};
-	AnyType* AXISCALL getAnyObject();
+    AnyType* AXISCALL getAnyObject();
     void serializeTag(AxisString& xmlStr, const AnyElement* node, AxisString& nsDecls);
     void getChardataAs(void** pValue, XSDTYPE type);
 
@@ -314,10 +314,10 @@
     ISoapAttachment* getAttachment(const char* pcAttachmentid);
     ISoapAttachment** getAllAttachments(int *pAttchArraySize);
 
-	/**
-	 * Returns a complex fault as an XML string 
-	 */
-	xsd__string getFaultAsXMLString();
+    /**
+     * Returns a complex fault as an XML string 
+     */
+    xsd__string getFaultAsXMLString();
 
     /*
      *This class is used by the DeSerializer to set the input stream back to 

Modified: webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapEnvelope.cpp Tue Dec  2 21:29:56 2008
@@ -40,18 +40,18 @@
 SoapEnvelope::
 SoapEnvelope()
 {
-	logEntryEngine("SoapEnvelope::SoapEnvelope")
+    logEntryEngine("SoapEnvelope::SoapEnvelope")
 
     m_pSoapHeader= NULL;
     m_pSoapBody= NULL;
     
-	logExit()
+    logExit()
 }
 
 SoapEnvelope::
 ~SoapEnvelope()
 {
-	logEntryEngine("SoapEnvelope::~SoapEnvelope")
+    logEntryEngine("SoapEnvelope::~SoapEnvelope")
 
     // deletion of attributes 
     list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
@@ -81,33 +81,33 @@
     // deletion of soap body 
     delete m_pSoapBody;
     
-	logExit()
+    logExit()
 }
 
 void SoapEnvelope::
 setSoapHeader(SoapHeader* soapHeader)
 {
-	logEntryEngine("SoapEnvelope::setSoapHeader")
+    logEntryEngine("SoapEnvelope::setSoapHeader")
 
     m_pSoapHeader= soapHeader;
-	
-	logExit()
+    
+    logExit()
 }
 
 void SoapEnvelope::
 setSoapBody(SoapBody* soapBody)
 {
-	logEntryEngine("SoapEnvelope::setSoapBody")
+    logEntryEngine("SoapEnvelope::setSoapBody")
 
     m_pSoapBody= soapBody;
-	
-	logExit()
+    
+    logExit()
 }
 
 int SoapEnvelope::
 serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion)
 {    
-	logEntryEngine("SoapEnvelope::serialize")
+    logEntryEngine("SoapEnvelope::serialize")
 
     int iStatus= AXIS_SUCCESS;
     do
@@ -140,39 +140,39 @@
     } 
     while (0);
 
-	logExitWithReturnCode(iStatus)
-	
+    logExitWithReturnCode(iStatus)
+    
     return iStatus;
 }
 
 int SoapEnvelope::
 addAttribute(Attribute *pAttribute)
 {
-	logEntryEngine("SoapEnvelope::addAttribute")
+    logEntryEngine("SoapEnvelope::addAttribute")
 
     m_attributes.push_back(pAttribute);
 
-	logExitWithReturnCode(AXIS_SUCCESS)
-	
+    logExitWithReturnCode(AXIS_SUCCESS)
+    
     return AXIS_SUCCESS;
 }
 
 int SoapEnvelope::
 addNamespaceDecl(Attribute *pAttribute)
 {
-	logEntryEngine("SoapEnvelope::addNamespaceDecl")
+    logEntryEngine("SoapEnvelope::addNamespaceDecl")
 
     m_namespaceDecls.push_back(pAttribute);
 
-	logExitWithReturnCode(AXIS_SUCCESS)
-	
+    logExitWithReturnCode(AXIS_SUCCESS)
+    
     return AXIS_SUCCESS;
 }
 
 int SoapEnvelope::
 serializeAttributes(SoapSerializer& pSZ)
 {    
-	logEntryEngine("SoapEnvelope::serializeAttributes")
+    logEntryEngine("SoapEnvelope::serializeAttributes")
 
     list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
 
@@ -182,15 +182,15 @@
         itCurrAttribute++;        
     }    
 
-	logExitWithReturnCode(AXIS_SUCCESS)
-	
+    logExitWithReturnCode(AXIS_SUCCESS)
+    
     return AXIS_SUCCESS;    
 }
 
 int SoapEnvelope::
 serializeNamespaceDecl(SoapSerializer& pSZ)
 {    
-	logEntryEngine("SoapEnvelope::serializeNamespaceDecl")
+    logEntryEngine("SoapEnvelope::serializeNamespaceDecl")
 
     list<Attribute*>::iterator itCurrNamespaceDecl= m_namespaceDecls.begin();
 
@@ -201,7 +201,7 @@
         itCurrNamespaceDecl++;        
     }    
     
-	logExitWithReturnCode(AXIS_SUCCESS)
+    logExitWithReturnCode(AXIS_SUCCESS)
 
     return AXIS_SUCCESS;
 }
@@ -209,11 +209,11 @@
 int SoapEnvelope::
 setPrefix(const AxisChar* prefix)
 {
-	logEntryEngine("SoapEnvelope::setPrefix")
+    logEntryEngine("SoapEnvelope::setPrefix")
 
     m_sPrefix= prefix;
-	
-	logExitWithReturnCode(AXIS_SUCCESS)
+    
+    logExitWithReturnCode(AXIS_SUCCESS)
 
     return AXIS_SUCCESS;
 }
@@ -221,29 +221,29 @@
 int SoapEnvelope::
 addStandardNamespaceDecl(const Attribute *pAttribute)
 {
-	logEntryEngine("SoapEnvelope::addStandardNamespaceDecl")
+    logEntryEngine("SoapEnvelope::addStandardNamespaceDecl")
 
     m_StandardNamespaceDecls.push_back(pAttribute);
-	
-	logExitWithReturnCode(AXIS_SUCCESS)
-	
+    
+    logExitWithReturnCode(AXIS_SUCCESS)
+    
     return AXIS_SUCCESS;
 }
 
 void SoapEnvelope::
 clearStandardNamespaceDecl()
 {
-	logEntryEngine("SoapEnvelope::clearStandardNamespaceDecl")
+    logEntryEngine("SoapEnvelope::clearStandardNamespaceDecl")
 
     m_StandardNamespaceDecls.clear();
-	
-	logExit()
+    
+    logExit()
 }
 
 int SoapEnvelope::
 serializeStandardNamespaceDecl(SoapSerializer &pSZ)
 {
-	logEntryEngine("SoapEnvelope::serializeStandardNamespaceDecl")
+    logEntryEngine("SoapEnvelope::serializeStandardNamespaceDecl")
 
     list<const Attribute*>::iterator itCurrNamespaceDecl= m_StandardNamespaceDecls.begin();
     while (itCurrNamespaceDecl != m_StandardNamespaceDecls.end()) 
@@ -252,7 +252,7 @@
         itCurrNamespaceDecl++;        
     }    
     
-	logExitWithReturnCode(AXIS_SUCCESS)
+    logExitWithReturnCode(AXIS_SUCCESS)
 
     return AXIS_SUCCESS;
 }

Modified: webservices/axis/trunk/c/src/soap/SoapHeader.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapHeader.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapHeader.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapHeader.cpp Tue Dec  2 21:29:56 2008
@@ -37,16 +37,16 @@
 
 SoapHeader::
 SoapHeader()
-{	
-	logEntryEngine("SoapHeader::SoapHeader")
-	
+{    
+    logEntryEngine("SoapHeader::SoapHeader")
+    
     logExit()
 }
 
 SoapHeader::
 ~SoapHeader()
 {
-	logEntryEngine("SoapHeader::~SoapHeader")
+    logEntryEngine("SoapHeader::~SoapHeader")
 
     // Header blocks are not deleted here any more. Its the responsibility of
     // either a handler or stub etc to delete any header block created by them
@@ -70,27 +70,27 @@
 void SoapHeader::
 addHeaderBlock(IHeaderBlock* pHeaderBlock)
 {
-	logEntryEngine("SoapHeader::addHeaderBlock")
+    logEntryEngine("SoapHeader::addHeaderBlock")
 
     if (pHeaderBlock)
     {
         m_headerBlocks.push_back(pHeaderBlock);
     }
-	
-	logExit()
+    
+    logExit()
 }
 
 int SoapHeader::
 serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion)
 {    
-	logEntryEngine("SoapHeader::serialize")
+    logEntryEngine("SoapHeader::serialize")
 
     int iStatus= AXIS_SUCCESS;
 
     do
     {
-		if (0 == m_headerBlocks.size()) 
-			break;
+        if (0 == m_headerBlocks.size()) 
+            break;
         
         pSZ.serialize("<", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix,
             ":", gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_HEADER],
@@ -124,7 +124,7 @@
     } 
     while(0);
 
-	logExitWithReturnCode(iStatus)
+    logExitWithReturnCode(iStatus)
 
     return iStatus;
 }
@@ -132,9 +132,9 @@
 int SoapHeader::
 addAttribute(Attribute *pAttribute)
 {
-	logEntryEngine("SoapHeader::addAttribute")
-	
-	int iStatus = AXIS_FAIL;
+    logEntryEngine("SoapHeader::addAttribute")
+    
+    int iStatus = AXIS_FAIL;
 
     if (pAttribute)
     {
@@ -142,7 +142,7 @@
         iStatus = AXIS_SUCCESS;
     }
 
-	logExitWithReturnCode(iStatus)
+    logExitWithReturnCode(iStatus)
 
     return iStatus;
 }
@@ -151,7 +151,7 @@
 int SoapHeader::
 serializeAttributes(SoapSerializer& pSZ)
 {
-	logEntryEngine("SoapHeader::serializeAttributes")
+    logEntryEngine("SoapHeader::serializeAttributes")
 
     list<Attribute*>::iterator itCurrAttribute= m_attributes.begin();
 
@@ -161,7 +161,7 @@
         itCurrAttribute++;        
     }    
 
-	logExitWithReturnCode(AXIS_SUCCESS)
+    logExitWithReturnCode(AXIS_SUCCESS)
 
     return AXIS_SUCCESS;    
 }
@@ -169,17 +169,17 @@
 int SoapHeader::
 addNamespaceDecl(Attribute *pAttribute)
 {
-	logEntryEngine("SoapHeader::addNamespaceDecl")
+    logEntryEngine("SoapHeader::addNamespaceDecl")
 
-	int iStatus = AXIS_FAIL;
-	
+    int iStatus = AXIS_FAIL;
+    
     if (pAttribute)
     {
         m_namespaceDecls.push_back(pAttribute);
         iStatus = AXIS_SUCCESS;
     }
-	
-	logExitWithReturnCode(iStatus)
+    
+    logExitWithReturnCode(iStatus)
 
     return iStatus;
 }
@@ -187,7 +187,7 @@
 int SoapHeader::
 serializeNamespaceDecl(SoapSerializer& pSZ)
 {
-	logEntryEngine("SoapHeader::serializeNamespaceDecl")
+    logEntryEngine("SoapHeader::serializeNamespaceDecl")
 
     list<Attribute*>::iterator itCurrNamespaceDecl= m_namespaceDecls.begin();
 
@@ -197,7 +197,7 @@
         itCurrNamespaceDecl++;        
     }    
 
-	logExitWithReturnCode(AXIS_SUCCESS)
+    logExitWithReturnCode(AXIS_SUCCESS)
 
     return AXIS_SUCCESS;
 }
@@ -205,7 +205,7 @@
 IHeaderBlock* SoapHeader::
 getHeaderBlock(bool bRemoveOrNot)
 {
-	logEntryEngine("SoapHeader::getHeaderBlock")
+    logEntryEngine("SoapHeader::getHeaderBlock")
 
     IHeaderBlock* tmpHeaderBlock = NULL;
 
@@ -214,8 +214,8 @@
     if(itCurrHeaderBlock != m_headerBlocks.end())
     {
         tmpHeaderBlock = (*itCurrHeaderBlock);
-		if (bRemoveOrNot == true)
-			m_headerBlocks.pop_front();
+        if (bRemoveOrNot == true)
+            m_headerBlocks.pop_front();
     }
 
     logExitWithPointer(tmpHeaderBlock)
@@ -235,7 +235,7 @@
 IHeaderBlock* SoapHeader::
 getHeaderBlock(const AxisChar *pName, const AxisChar *pNamespace, bool bRemoveOrNot)
 {
-	logEntryEngine("SoapHeader::getHeaderBlock")
+    logEntryEngine("SoapHeader::getHeaderBlock")
 
     HeaderBlock* tmpHeaderBlock = NULL;
 
@@ -248,13 +248,13 @@
         if ((strcmp(((tmpHeaderBlock)->m_localname).c_str(), pName) == 0) && 
                 (strcmp(((tmpHeaderBlock)->m_uri).c_str(), pNamespace) == 0))
         {
-			if (bRemoveOrNot == true)
-				m_headerBlocks.remove(tmpHeaderBlock);
+            if (bRemoveOrNot == true)
+                m_headerBlocks.remove(tmpHeaderBlock);
             break;
         }
         else
         {
-        	tmpHeaderBlock = NULL;
+            tmpHeaderBlock = NULL;
             itCurrHeaderBlock++;
         }
     }
@@ -268,52 +268,52 @@
 IHeaderBlock* SoapHeader::
 getFirstHeaderBlock() 
 {
-	logEntryEngine("SoapHeader::getFirstHeaderBlock")
+    logEntryEngine("SoapHeader::getFirstHeaderBlock")
 
-	m_itHeaderBlocks = m_headerBlocks.begin();
-	IHeaderBlock* tmpIHeaderBlock=NULL;
-	if (m_itHeaderBlocks != m_headerBlocks.end())
-		tmpIHeaderBlock = *m_itHeaderBlocks;
-	
+    m_itHeaderBlocks = m_headerBlocks.begin();
+    IHeaderBlock* tmpIHeaderBlock=NULL;
+    if (m_itHeaderBlocks != m_headerBlocks.end())
+        tmpIHeaderBlock = *m_itHeaderBlocks;
+    
     logExitWithPointer(tmpIHeaderBlock)
 
-	return tmpIHeaderBlock;
+    return tmpIHeaderBlock;
 }
 
 IHeaderBlock* SoapHeader::
 getNextHeaderBlock() 
 {
-	logEntryEngine("SoapHeader::getNextHeaderBlock")
+    logEntryEngine("SoapHeader::getNextHeaderBlock")
 
-	m_itHeaderBlocks++;
-	IHeaderBlock* tmpIHeaderBlock=NULL;
-	if (m_itHeaderBlocks != m_headerBlocks.end())
-		tmpIHeaderBlock = *m_itHeaderBlocks;
-	
+    m_itHeaderBlocks++;
+    IHeaderBlock* tmpIHeaderBlock=NULL;
+    if (m_itHeaderBlocks != m_headerBlocks.end())
+        tmpIHeaderBlock = *m_itHeaderBlocks;
+    
     logExitWithPointer(tmpIHeaderBlock)
 
-	return tmpIHeaderBlock;
+    return tmpIHeaderBlock;
 }
 
 IHeaderBlock* SoapHeader::
 getCurrentHeaderBlock()
 {
-	logEntryEngine("SoapHeader::getCurrentHeaderBlock")
+    logEntryEngine("SoapHeader::getCurrentHeaderBlock")
 
-	IHeaderBlock* tmpIHeaderBlock=NULL;
-	if (m_itHeaderBlocks != m_headerBlocks.end())
-		tmpIHeaderBlock = *m_itHeaderBlocks;
+    IHeaderBlock* tmpIHeaderBlock=NULL;
+    if (m_itHeaderBlocks != m_headerBlocks.end())
+        tmpIHeaderBlock = *m_itHeaderBlocks;
 
     logExitWithPointer(tmpIHeaderBlock)
 
-	return tmpIHeaderBlock;
+    return tmpIHeaderBlock;
 }
 
 
 int SoapHeader::
 deleteHeaderBlock(const AxisChar *pName, const AxisChar *pNamespace)
 {
-	logEntryEngine("SoapHeader::deleteHeaderBlock")
+    logEntryEngine("SoapHeader::deleteHeaderBlock")
 
     int iStatus = AXIS_SUCCESS;
     HeaderBlock* tmpHeaderBlock = NULL;
@@ -337,7 +337,7 @@
     if (m_headerBlocks.empty())
         iStatus = AXIS_NO_REMAINING_SOAP_HEADERS;
     
-	logExitWithReturnCode(iStatus)
+    logExitWithReturnCode(iStatus)
 
     return iStatus;
 }
@@ -345,7 +345,7 @@
 void SoapHeader::
 clear()
 {
-	logEntryEngine("SoapHeader::clear")
+    logEntryEngine("SoapHeader::clear")
 
     // Header blocks are not deleted here. Its the responsibility of
     // either a handler or stub etc to delete any header block created by them

Modified: webservices/axis/trunk/c/src/soap/SoapHeader.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapHeader.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapHeader.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapHeader.h Tue Dec  2 21:29:56 2008
@@ -66,7 +66,7 @@
     
     const char* m_pcPrefix;
 public:
-	IHeaderBlock* getCurrentHeaderBlock();
+    IHeaderBlock* getCurrentHeaderBlock();
     /**
       * Gets and returns the Header Block, of the given name.
       *

Modified: webservices/axis/trunk/c/src/soap/SoapKeywordMapping.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapKeywordMapping.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapKeywordMapping.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapKeywordMapping.cpp Tue Dec  2 21:29:56 2008
@@ -101,5 +101,5 @@
 {
     return m_Map[nVersion];
 }
-AXIS_CPP_NAMESPACE_END	
+AXIS_CPP_NAMESPACE_END    
 

Modified: webservices/axis/trunk/c/src/soap/SoapSerializer.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapSerializer.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapSerializer.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapSerializer.cpp Tue Dec  2 21:29:56 2008
@@ -51,7 +51,7 @@
 SoapSerializer::
 SoapSerializer()
 {
-	logEntryEngine("SoapSerializer::SoapSerializer")
+    logEntryEngine("SoapSerializer::SoapSerializer")
 
     m_pSoapEnvelope = NULL;
     m_iSoapVersion = SOAP_VER_1_1;
@@ -59,13 +59,13 @@
     m_pNamespace = NULL;
     m_pContentIdSet = NULL;
     
-	logExit()
+    logExit()
 }
 
 SoapSerializer::
 ~SoapSerializer()
 {
-	logEntryEngine("SoapSerializer::~SoapSerializer")
+    logEntryEngine("SoapSerializer::~SoapSerializer")
 
     delete m_pSoapEnvelope;
 
@@ -92,11 +92,11 @@
 int SoapSerializer::
 setSoapEnvelope( SoapEnvelope * pSoapEnvelope)
 {
-	logEntryEngine("SoapSerializer::setSoapEnvelope")
+    logEntryEngine("SoapSerializer::setSoapEnvelope")
 
     m_pSoapEnvelope = pSoapEnvelope;
 
-	logExitWithReturnCode(AXIS_SUCCESS)
+    logExitWithReturnCode(AXIS_SUCCESS)
 
     return AXIS_SUCCESS;
 }
@@ -104,7 +104,7 @@
 int SoapSerializer::
 setSoapHeader( SoapHeader * pSoapHeader)
 {
-	logEntryEngine("SoapSerializer::setSoapHeader")
+    logEntryEngine("SoapSerializer::setSoapHeader")
 
     int intStatus = AXIS_FAIL;
 
@@ -128,7 +128,7 @@
 int SoapSerializer::
 setSoapBody( SoapBody * pSoapBody)
 {
-	logEntryEngine("SoapSerializer::setSoapBody")
+    logEntryEngine("SoapSerializer::setSoapBody")
 
     int intStatus = AXIS_FAIL;
 
@@ -146,7 +146,7 @@
 int SoapSerializer::
 setSoapMethod( SoapMethod *pSoapMethod)
 {
-	logEntryEngine("SoapSerializer::setSoapMethod")
+    logEntryEngine("SoapSerializer::setSoapMethod")
 
     int intStatus = AXIS_FAIL;
 
@@ -166,7 +166,7 @@
 int SoapSerializer::
 addOutputBasicArrayParam( const Axis_Array * pArray, XSDTYPE nType, const AxisChar * pName)
 {
-	logEntryEngine("SoapSerializer::addOutputBasicArrayParam")
+    logEntryEngine("SoapSerializer::addOutputBasicArrayParam")
 
     int    iSuccess = AXIS_SUCCESS;
 
@@ -176,10 +176,10 @@
     // We need to handle NULL array passed in which means serialize empty array.
     if (pArray)
     {
-    	pLocalArray = pArray->clone();
-    	pAb = makeArrayBean( nType, pLocalArray->m_Array );
-    	pAb->SetDimension(pLocalArray->m_Size);
-    	
+        pLocalArray = pArray->clone();
+        pAb = makeArrayBean( nType, pLocalArray->m_Array );
+        pAb->SetDimension(pLocalArray->m_Size);
+        
         // We're now finished with the local array object, so it can be deleted
         // However, we need to de-couple from the internal array, which is now owned
         // by the ArrayBean.
@@ -189,8 +189,8 @@
     }
     else
     {
-    	pAb = makeArrayBean( nType, (void **)NULL );
-    	pAb->SetDimension(0);
+        pAb = makeArrayBean( nType, (void **)NULL );
+        pAb->SetDimension(0);
     }
 
     Param* pParam = new Param();
@@ -218,7 +218,7 @@
                           void * pSZFunct, void * pDelFunct,
                           const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapSerializer::addOutputCmplxArrayParam")
+    logEntryEngine("SoapSerializer::addOutputCmplxArrayParam")
 
     int    iSuccess = AXIS_SUCCESS;
 
@@ -228,21 +228,21 @@
     // We need to handle NULL array passed in which means serialize empty array.
     if (pArray)
     {
-	    pLocalArray = pArray->clone();
-	    pAb = makeArrayBean( pLocalArray->m_Array, pSZFunct, pDelFunct);
-	    pAb->SetDimension( pLocalArray->m_Size);
-	    
+        pLocalArray = pArray->clone();
+        pAb = makeArrayBean( pLocalArray->m_Array, pSZFunct, pDelFunct);
+        pAb->SetDimension( pLocalArray->m_Size);
+        
         // We're now finished with the local array object, so it can be deleted
         // However, we need to de-couple from the internal array, which is now owned
         // by the ArrayBean.
-	    pLocalArray->m_Array = NULL;
-	    pLocalArray->m_Size = 0;
-	    delete pLocalArray;
+        pLocalArray->m_Array = NULL;
+        pLocalArray->m_Size = 0;
+        delete pLocalArray;
     }
     else
     {
-    	pAb = makeArrayBean( (void **)NULL, pSZFunct, pDelFunct);
-    	pAb->SetDimension(0);
+        pAb = makeArrayBean( (void **)NULL, pSZFunct, pDelFunct);
+        pAb->SetDimension(0);
     }
     
     Param * pParam = new Param();
@@ -282,7 +282,7 @@
                      void * pSZFunct, void * pDelFunct,
                      const AxisChar * pName, const AxisChar * pNamespace)
 { 
-	logEntryEngine("SoapSerializer::addOutputCmplxParam")
+    logEntryEngine("SoapSerializer::addOutputCmplxParam")
 
     int    iSuccess = AXIS_SUCCESS;
 
@@ -309,7 +309,7 @@
                 void * pSZFunct, void * pDelFunct,
                 const AxisChar * pName, const AxisChar * pNamespace)
 { 
-	logEntryEngine("SoapSerializer::addFaultDetail")
+    logEntryEngine("SoapSerializer::addFaultDetail")
 
     int    iSuccess = AXIS_SUCCESS;
     Param * pParam = new Param();
@@ -334,24 +334,24 @@
 int SoapSerializer::
 addFaultDetail( const AxisChar * pDetail)
 {
-	logEntryEngine("SoapSerializer::addFaultDetail")
+    logEntryEngine("SoapSerializer::addFaultDetail")
 
-	int iStatus = AXIS_FAIL;
+    int iStatus = AXIS_FAIL;
     if( m_pSoapEnvelope &&
         (m_pSoapEnvelope->m_pSoapBody) && (m_pSoapEnvelope->m_pSoapBody->m_pSoapFault))
-	{
-		iStatus = m_pSoapEnvelope->m_pSoapBody->m_pSoapFault->setFaultDetail(pDetail);
-	}
+    {
+        iStatus = m_pSoapEnvelope->m_pSoapBody->m_pSoapFault->setFaultDetail(pDetail);
+    }
 
     logExitWithReturnCode(iStatus)
     
-	return iStatus;
+    return iStatus;
 }
 
 int SoapSerializer::
 setSoapFault( SoapFault * pSoapFault)
 {
-	logEntryEngine("SoapSerializer::setSoapFault")
+    logEntryEngine("SoapSerializer::setSoapFault")
 
     int intStatus = AXIS_FAIL;
 
@@ -371,7 +371,7 @@
 int SoapSerializer::
 setOutputStream( SOAPTransport * pStream)
 {
-	logEntryEngine("SoapSerializer::setOutputStream")
+    logEntryEngine("SoapSerializer::setOutputStream")
 
     int    iStatus = AXIS_SUCCESS;
 
@@ -431,8 +431,8 @@
 
             if( (iStatus = m_pSoapEnvelope->serialize( *this, (SOAP_VERSION) m_iSoapVersion)) == AXIS_FAIL)
             {
-            	logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_MESSAGE_INCOMPLETE", "The SOAP serializer has detected errors in the header or envelope. Transmission has been aborted.")
-            	
+                logThrowExceptionWithData("AxisSoapException - CLIENT_SOAP_MESSAGE_INCOMPLETE", "The SOAP serializer has detected errors in the header or envelope. Transmission has been aborted.")
+                
                 throw AxisSoapException( CLIENT_SOAP_MESSAGE_INCOMPLETE, "The SOAP serializer has detected errors in the header or envelope. Transmission has been aborted.");
             }
 
@@ -444,7 +444,7 @@
     {
         e = e;
         
-    	logRethrowException()
+        logRethrowException()
 
         throw;
     }
@@ -452,13 +452,13 @@
     {
         e = e;
         
-    	logRethrowException()
+        logRethrowException()
 
         throw;
     }
     catch( ...)
     {
-    	logRethrowException()
+        logRethrowException()
 
         throw;
     }
@@ -475,10 +475,10 @@
 void SoapSerializer::
 markEndOfStream()
 {
-	logEntryEngine("SoapSerializer::markEndOfStream")
+    logEntryEngine("SoapSerializer::markEndOfStream")
 
     m_pOutputStream->flushOutput();
-	
+    
     logExit()
 }
 
@@ -490,7 +490,7 @@
 int SoapSerializer::
 init()
 {
-	logEntryEngine("SoapSerializer::init")
+    logEntryEngine("SoapSerializer::init")
 
     m_nStatus = AXIS_SUCCESS;
 
@@ -512,7 +512,7 @@
 int SoapSerializer::
 setSoapVersion( SOAP_VERSION nSoapVersion)
 {
-	logEntryEngine("SoapSerializer::setSoapVersion")
+    logEntryEngine("SoapSerializer::setSoapVersion")
 
     m_iSoapVersion = nSoapVersion;
 
@@ -536,31 +536,31 @@
 void SoapSerializer::
 removeNamespacePrefix( const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapSerializer::removeNamespacePrefix")
+    logEntryEngine("SoapSerializer::removeNamespacePrefix")
 
     if( m_NsStack.find( pNamespace) != m_NsStack.end())
         m_NsStack.erase( pNamespace);
-	
-	logExit()
+    
+    logExit()
 }
 
 const AxisChar * SoapSerializer::
 getNamespacePrefix( const AxisChar * pNamespace)
 {
-	bool blnIsNewPrefix;
-	return getNamespacePrefix(pNamespace, blnIsNewPrefix);
+    bool blnIsNewPrefix;
+    return getNamespacePrefix(pNamespace, blnIsNewPrefix);
 }
 
 const AxisChar * SoapSerializer::
 getNamespacePrefix( const AxisChar * pNamespace, bool & blnIsNewPrefix)
 {
-	blnIsNewPrefix = false;
-	
-	// We will not map null or null string namespaces...MUST return null string
-	// since the namespace is sometimes assigned to object of type string class.
-	if (pNamespace == (const AxisChar *)NULL || pNamespace[0] == '\0')	
-		return (const AxisChar *)"";
-	
+    blnIsNewPrefix = false;
+    
+    // We will not map null or null string namespaces...MUST return null string
+    // since the namespace is sometimes assigned to object of type string class.
+    if (pNamespace == (const AxisChar *)NULL || pNamespace[0] == '\0')    
+        return (const AxisChar *)"";
+    
     if( m_NsStack.find( pNamespace) == m_NsStack.end())
     {
         m_nCounter++;
@@ -575,9 +575,9 @@
 IWrapperSoapSerializer& SoapSerializer::
 operator << (const AxisChar * cSerialized)
 {
-	logSetFunctionNameEngine("SoapSerializer::operator <<")
+    logSetFunctionNameEngine("SoapSerializer::operator <<")
 
-	// some thing has gone wrong. So do nothing 
+    // some thing has gone wrong. So do nothing 
     if( AXIS_SUCCESS != m_nStatus) 
         return *this;
 
@@ -590,7 +590,7 @@
     {
         e = e;
         
-    	logRethrowException()
+        logRethrowException()
 
         throw;
     }
@@ -598,13 +598,13 @@
     {
         e = e;
         
-    	logRethrowException()
+        logRethrowException()
 
         throw;
     }
     catch(...)
     {
-    	logRethrowException()
+        logRethrowException()
 
         throw;
     }
@@ -615,11 +615,11 @@
 int SoapSerializer::
 createSoapMethod( const AxisChar * sLocalName, const AxisChar * sURI)
 {
-	logEntryEngine("SoapSerializer::createSoapMethod")
+    logEntryEngine("SoapSerializer::createSoapMethod")
 
-	if (NULL == m_pSoapEnvelope || NULL == m_pSoapEnvelope->m_pSoapBody)
-		return AXIS_FAIL;
-		
+    if (NULL == m_pSoapEnvelope || NULL == m_pSoapEnvelope->m_pSoapBody)
+        return AXIS_FAIL;
+        
     SoapMethod * pMethod = m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod;
     if (pMethod == NULL)
     {
@@ -645,7 +645,7 @@
                  const AxisChar * sFaultCode,
                  const AxisChar * sFaultString)
 {
-	logEntryEngine("SoapSerializer::createSoapFault")
+    logEntryEngine("SoapSerializer::createSoapFault")
 
     SoapFault * pSoapFault = new SoapFault();
 
@@ -676,7 +676,7 @@
 ArrayBean * SoapSerializer::
 makeArrayBean( XSDTYPE nType, void ** pArray)
 {
-	logEntryEngine("SoapSerializer::makeArrayBean")
+    logEntryEngine("SoapSerializer::makeArrayBean")
 
     ArrayBean* pAb = new ArrayBean();
 
@@ -695,7 +695,7 @@
 ArrayBean * SoapSerializer::
 makeArrayBean(void ** pObject, void * pSZFunct, void * pDelFunct)
 {
-	logEntryEngine("SoapSerializer::makeArrayBean")
+    logEntryEngine("SoapSerializer::makeArrayBean")
 
     ArrayBean* pAb = new ArrayBean();
 
@@ -713,7 +713,7 @@
 IHeaderBlock * SoapSerializer::
 createHeaderBlock()
 {
-	logEntryEngine("SoapSerializer::createHeaderBlock")
+    logEntryEngine("SoapSerializer::createHeaderBlock")
 
     HeaderBlock * pHeaderBlock= new HeaderBlock();
 
@@ -727,7 +727,7 @@
 int SoapSerializer::
 setHeaderBlock( HeaderBlock * pHeaderBlock)
 {
-	logEntryEngine("SoapSerializer::setHeaderBlock")
+    logEntryEngine("SoapSerializer::setHeaderBlock")
 
     int intStatus = AXIS_FAIL;
 
@@ -758,7 +758,7 @@
 int SoapSerializer::
 removeSoapHeader()
 {
-	logEntryEngine("SoapSerializer::removeSoapHeader")
+    logEntryEngine("SoapSerializer::removeSoapHeader")
 
     delete m_pSoapEnvelope->m_pSoapHeader;
     m_pSoapEnvelope->m_pSoapHeader= NULL;
@@ -777,20 +777,20 @@
                      void * pSZFunct, void * pDelFunct, 
                      const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapSerializer::serializeCmplxArray")
+    logEntryEngine("SoapSerializer::serializeCmplxArray")
 
     ArrayBean  * pAb = (ArrayBean *)NULL;
     
     // We need to handle NULL array passed in which means serialize empty array.
     if (pArray)
     {
-    	pAb = (ArrayBean*) makeArrayBean( pArray->m_Array, pSZFunct, pDelFunct);
-    	pAb->SetDimension( pArray->m_Size);
-    }	
+        pAb = (ArrayBean*) makeArrayBean( pArray->m_Array, pSZFunct, pDelFunct);
+        pAb->SetDimension( pArray->m_Size);
+    }    
     else
     {
-    	pAb = (ArrayBean*) makeArrayBean( (void **)NULL, pSZFunct, pDelFunct);
-    	pAb->SetDimension(0);
+        pAb = (ArrayBean*) makeArrayBean( (void **)NULL, pSZFunct, pDelFunct);
+        pAb->SetDimension(0);
     }
 
     Param * pParam = new Param();
@@ -856,20 +856,20 @@
 serializeBasicArray(const Axis_Array* pArray, 
                     const AxisChar* pNamespace, XSDTYPE nType, const AxisChar* pName)
 {
-	logEntryEngine("SoapSerializer::serializeBasicArray")
+    logEntryEngine("SoapSerializer::serializeBasicArray")
 
     ArrayBean  * pAb = (ArrayBean *)NULL;
     
     // We need to handle NULL array passed in which means serialize empty array.
     if (pArray)
     {
-    	pAb = (ArrayBean*) makeArrayBean( nType, pArray->m_Array);
-    	pAb->SetDimension( pArray->m_Size);
-    }	
+        pAb = (ArrayBean*) makeArrayBean( nType, pArray->m_Array);
+        pAb->SetDimension( pArray->m_Size);
+    }    
     else
     {
-    	pAb = (ArrayBean*) makeArrayBean( nType, (void **)NULL);
-    	pAb->SetDimension(0);
+        pAb = (ArrayBean*) makeArrayBean( nType, (void **)NULL);
+        pAb->SetDimension(0);
     }
 
     Param * pParam = new Param();
@@ -928,7 +928,7 @@
 int SoapSerializer::
 addOutputParam( const AxisChar * pchName, void * pValue, XSDTYPE type)
 {
-	logEntryEngine("SoapSerializer::addOutputParam")
+    logEntryEngine("SoapSerializer::addOutputParam")
 
     IAnySimpleType* xsdValue = AxisUtils::createSimpleTypeObject(pValue, type);
     
@@ -938,19 +938,19 @@
     
     if( pParam)
     {
-	    pParam->m_Type = type;
-	    pParam->m_sName = pchName;
-	    pParam->setValue(type, xsdValue);
-	    
-	    if( m_pSoapEnvelope &&
-	        (m_pSoapEnvelope->m_pSoapBody) &&
-	        (m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod)) 
-	    {
-	        m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->addOutputParam( pParam);
-	        iStatus = AXIS_SUCCESS;
-	    }
-	    else
-	        delete pParam;
+        pParam->m_Type = type;
+        pParam->m_sName = pchName;
+        pParam->setValue(type, xsdValue);
+        
+        if( m_pSoapEnvelope &&
+            (m_pSoapEnvelope->m_pSoapBody) &&
+            (m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod)) 
+        {
+            m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->addOutputParam( pParam);
+            iStatus = AXIS_SUCCESS;
+        }
+        else
+            delete pParam;
     }
 
     logExitWithReturnCode(iStatus)
@@ -988,7 +988,7 @@
                     const AxisChar * pNamespace,
                     IAnySimpleType * pSimpleType) 
 {
-	logEntryEngine("SoapSerializer::serializeAsElement")
+    logEntryEngine("SoapSerializer::serializeAsElement")
 
     int iStatus = AXIS_FAIL;
 
@@ -1037,7 +1037,7 @@
                       const AxisChar * pNamespace, 
                       IAnySimpleType* pSimpleType)
 {
-	logEntryEngine("SoapSerializer::serializeAsAttribute")
+    logEntryEngine("SoapSerializer::serializeAsAttribute")
 
     int iStatus = AXIS_FAIL;
 
@@ -1062,7 +1062,7 @@
 void SoapSerializer::
 serializeVargs( const char * pFirst, va_list vList)
 {
-	logEntryEngine("SoapSerializer::serializeVargs")
+    logEntryEngine("SoapSerializer::serializeVargs")
 
     const char * pArg;
     
@@ -1084,7 +1084,7 @@
 void SoapSerializer::
 serialize( const char * pFirst, ...)
 {
-	logEntryEngine("SoapSerializer::serialize")
+    logEntryEngine("SoapSerializer::serialize")
 
     va_list vList;
 
@@ -1101,10 +1101,10 @@
 int SoapSerializer::
 addHeaderBlock( IHeaderBlock * pBlk)
 {
-	logEntryEngine("SoapSerializer::addHeaderBlock")
+    logEntryEngine("SoapSerializer::addHeaderBlock")
 
-	int iStatus = AXIS_FAIL;
-	
+    int iStatus = AXIS_FAIL;
+    
     if( m_pSoapEnvelope)
     {
         if( !m_pSoapEnvelope->m_pSoapHeader)
@@ -1172,7 +1172,7 @@
 createHeaderBlock( const AxisChar * pachLocalName, 
                    const AxisChar * pachUri)
 {
-	logEntryEngine("SoapSerializer::createHeaderBlock")
+    logEntryEngine("SoapSerializer::createHeaderBlock")
 
     HeaderBlock * pHeaderBlock= new HeaderBlock( pachLocalName, pachUri);
 
@@ -1186,13 +1186,13 @@
 SoapMethod * SoapSerializer::
 getSOAPMethod()
 {
-	logEntryEngine("SoapSerializer::getSOAPMethod")
+    logEntryEngine("SoapSerializer::getSOAPMethod")
 
-	SoapMethod * returnValue = NULL;
-	
+    SoapMethod * returnValue = NULL;
+    
     if ( m_pSoapEnvelope && (m_pSoapEnvelope->m_pSoapBody))
-    	returnValue = m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod;
-	
+        returnValue = m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod;
+    
     logExitWithPointer(returnValue)
     
     return returnValue;
@@ -1201,9 +1201,9 @@
 int SoapSerializer::
 setSOAPMethodAttribute( Attribute * pAttribute)
 {
-	logEntryEngine("SoapSerializer::setSOAPMethodAttribute")
-	
-	int iStatus = AXIS_FAIL;
+    logEntryEngine("SoapSerializer::setSOAPMethodAttribute")
+    
+    int iStatus = AXIS_FAIL;
 
     if( m_pSoapEnvelope &&
         (m_pSoapEnvelope->m_pSoapBody) &&
@@ -1221,19 +1221,19 @@
 void SoapSerializer::
 clearSOAPMethodAttributes()
 {
-	logEntryEngine("SoapSerializer::clearSOAPMethodAttributes")
+    logEntryEngine("SoapSerializer::clearSOAPMethodAttributes")
 
     if (m_pSoapEnvelope && m_pSoapEnvelope->m_pSoapBody
             && m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod)
         m_pSoapEnvelope->m_pSoapBody->m_pSoapMethod->clearAttributes();
-	
-	logExit()
+    
+    logExit()
 }
 
 int SoapSerializer::
 serializeAnyObject( AnyType * pAnyObject)
 {
-	logEntryEngine("SoapSerializer::serializeAnyObject")
+    logEntryEngine("SoapSerializer::serializeAnyObject")
 
     for( int i = 0; i < pAnyObject->_size; i++)
         serialize( pAnyObject->_array[i], 0);
@@ -1246,7 +1246,7 @@
 int SoapSerializer::
 addOutputAnyObject( AnyType * pAnyObject)
 {
-	logEntryEngine("SoapSerializer::addOutputAnyObject")
+    logEntryEngine("SoapSerializer::addOutputAnyObject")
 
     Param * pParam = new Param();
 
@@ -1267,13 +1267,13 @@
 getHeaderBlock( const AxisChar * pcName, 
                 const AxisChar * pcNamespace)
 {
-	logEntryEngine("SoapSerializer::getHeaderBlock")
+    logEntryEngine("SoapSerializer::getHeaderBlock")
  
     IHeaderBlock * returnValue = NULL;
-	
-    // there has been no <Header> element so there can be no Header blocks	
+    
+    // there has been no <Header> element so there can be no Header blocks    
     if (m_pSoapEnvelope && m_pSoapEnvelope->m_pSoapHeader)
-    	returnValue = m_pSoapEnvelope->m_pSoapHeader->getHeaderBlock( pcName, pcNamespace, false);
+        returnValue = m_pSoapEnvelope->m_pSoapHeader->getHeaderBlock( pcName, pcNamespace, false);
     
     logExitWithPointer(returnValue)
 
@@ -1293,7 +1293,7 @@
 int SoapSerializer::
 serializeAsChardata( void * pValue, XSDTYPE type)
 {
-	logEntryEngine("SoapSerializer::serializeAsChardata")
+    logEntryEngine("SoapSerializer::serializeAsChardata")
 
     char * pStr = m_Buf;
 
@@ -1312,7 +1312,7 @@
 void SoapSerializer::
 serializeAttachments( SoapSerializer &pSZ)
 {
-	logEntryEngine("SoapSerializer::serializeAttachments")
+    logEntryEngine("SoapSerializer::serializeAttachments")
 
     /*serializing the attachments*/
     map<AxisXMLString, ISoapAttachment*>::iterator itCurrAttach= m_SoapAttachments.begin();
@@ -1374,7 +1374,7 @@
 addNamespaceToEnvelope( AxisChar * pachNamespaceURI,
                         AxisChar * pachPrefix)
 {
-	logEntryEngine("SoapSerializer::addNamespaceToEnvelope")
+    logEntryEngine("SoapSerializer::addNamespaceToEnvelope")
 
     std::list<Attribute*> attributeList;
     Attribute * pNameSpace = new Attribute( attributeList, pachPrefix, "xmlns", pachNamespaceURI);
@@ -1507,7 +1507,7 @@
 int SoapSerializer::
 deleteHeaderBlock( const AxisChar * pName, const AxisChar * pNamespace)
 {
-	logEntryEngine("SoapSerializer::deleteHeaderBlock")
+    logEntryEngine("SoapSerializer::deleteHeaderBlock")
 
     int iStatus = AXIS_SUCCESS;
 
@@ -1529,7 +1529,7 @@
 void SoapSerializer::
 reset()
 {
-	logEntryEngine("SoapSerializer::reset")
+    logEntryEngine("SoapSerializer::reset")
 
     m_nCounter = 0; // reset namespace prifix counter 
 

Modified: webservices/axis/trunk/c/src/soap/SoapSerializer.h
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/SoapSerializer.h?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapSerializer.h (original)
+++ webservices/axis/trunk/c/src/soap/SoapSerializer.h Tue Dec  2 21:29:56 2008
@@ -56,11 +56,11 @@
 class SoapSerializer : public IHandlerSoapSerializer
 {
 private:
-	map<AxisString, ISoapAttachment*> m_SoapAttachments;
-	list<SoapAttachmentReference*> m_attachmentRefs;
+    map<AxisString, ISoapAttachment*> m_SoapAttachments;
+    list<SoapAttachmentReference*> m_attachmentRefs;
     int m_nCounter;
     AxisChar m_Buf[BTS_BUFFSIZE];
-    SoapEnvelope* m_pSoapEnvelope;    	
+    SoapEnvelope* m_pSoapEnvelope;        
     int m_iSoapVersion;
     AXIS_BINDING_STYLE m_nStyle;
     /* Overall status of Serializer. If anything goes wrong this is not AXIS_SUCCESS */
@@ -69,13 +69,13 @@
     map<AxisXMLString, AxisXMLString> m_NsStack;
     /* Provider type of current service that uses this Serializer object */
     PROVIDERTYPE m_ProviderType;
-	/* the local namespace for this serializer */
+    /* the local namespace for this serializer */
     AxisChar* m_pNamespace;
-	ContentIdSet *m_pContentIdSet;
+    ContentIdSet *m_pContentIdSet;
 
 public:
-	inline const AxisChar* AXISCALL getNamespace() const {return m_pNamespace;}; 
-	inline void AXISCALL setNamespace(const AxisChar* pNamespace) {m_pNamespace = (const_cast<AxisChar*>(pNamespace));}; 
+    inline const AxisChar* AXISCALL getNamespace() const {return m_pNamespace;}; 
+    inline void AXISCALL setNamespace(const AxisChar* pNamespace) {m_pNamespace = (const_cast<AxisChar*>(pNamespace));}; 
 
 #ifdef UNIT_TESTING_ON
     int setOutputStreamForTesting(SOAPTransport* pStream);
@@ -84,7 +84,7 @@
 
     int AXISCALL createSoapFault(const AxisChar* sLocalName, 
         const AxisChar* sURI, const AxisChar* sFaultCode,
-	const AxisChar* sFaultString);
+    const AxisChar* sFaultString);
 
     IWrapperSoapSerializer& operator<<(const AxisChar* cSerialized);
     /**
@@ -140,9 +140,9 @@
 
     int AXISCALL serializeBasicArray(const Axis_Array* pArray, XSDTYPE nType, 
         const AxisChar* pName);
-	
+    
     int AXISCALL serializeBasicArray(const Axis_Array* pArray, const AxisChar* pNamespace,
-		XSDTYPE nType, const AxisChar* pName);
+        XSDTYPE nType, const AxisChar* pName);
 
 
     /* following two functions are needed by serializer functions of complex 
@@ -165,29 +165,29 @@
     IHeaderBlock* createHeaderBlock();
     
 private:
-	bool checkAttachmentAvailability();
-	void serializeAttachments(SoapSerializer &pSZ);
+    bool checkAttachmentAvailability();
+    void serializeAttachments(SoapSerializer &pSZ);
     BasicTypeSerializer m_BTSZ;
     SOAPTransport* m_pOutputStream;
 
 public:
-	IHeaderBlock* getCurrentHeaderBlock();
-	ISoapAttachment* createSoapAttachment();
-	void addNamespaceToNamespaceList(const AxisChar *pachNamespaceURI, const AxisChar* pachPrefix);
-	void addNamespaceToEnvelope(AxisChar *pachNamespaceURI, AxisChar* pachPrefix);
-	void addAttachmentBody(const AxisChar* achId, xsd__base64Binary* pAttchBody);
-	void addAttachmentHeader(const AxisChar* achId, const AxisChar* achHeaderName, const AxisChar* achHeaderValue);
-	void addAttachment(const AxisChar* achId, ISoapAttachment* pAttach);
+    IHeaderBlock* getCurrentHeaderBlock();
+    ISoapAttachment* createSoapAttachment();
+    void addNamespaceToNamespaceList(const AxisChar *pachNamespaceURI, const AxisChar* pachPrefix);
+    void addNamespaceToEnvelope(AxisChar *pachNamespaceURI, AxisChar* pachPrefix);
+    void addAttachmentBody(const AxisChar* achId, xsd__base64Binary* pAttchBody);
+    void addAttachmentHeader(const AxisChar* achId, const AxisChar* achHeaderName, const AxisChar* achHeaderValue);
+    void addAttachment(const AxisChar* achId, ISoapAttachment* pAttach);
     void addAttachments(ISoapAttachment** pAttach, int iAttchArraySize);
-	void setContentIdSet(ContentIdSet *pContentIdSet);
-	void addAttachmentParameter(ISoapAttachment* att, const char* pName, IAttribute **attributes, int nAttributes);
-	IHeaderBlock* getHeaderBlock(const AxisChar* pcName, const AxisChar* pcNamespace);
-	IHeaderBlock* getFirstHeaderBlock();
-	IHeaderBlock* getNextHeaderBlock();
+    void setContentIdSet(ContentIdSet *pContentIdSet);
+    void addAttachmentParameter(ISoapAttachment* att, const char* pName, IAttribute **attributes, int nAttributes);
+    IHeaderBlock* getHeaderBlock(const AxisChar* pcName, const AxisChar* pcNamespace);
+    IHeaderBlock* getFirstHeaderBlock();
+    IHeaderBlock* getNextHeaderBlock();
 
-	int setSOAPMethodAttribute(Attribute* pAttribute);
+    int setSOAPMethodAttribute(Attribute* pAttribute);
     void clearSOAPMethodAttributes();
-	SoapMethod* getSOAPMethod();
+    SoapMethod* getSOAPMethod();
     IHeaderBlock* createHeaderBlock(const AxisChar *pachLocalName,
         const AxisChar *pachUri);
     /* to add a header block to the Serializer. Probably by a handler */
@@ -203,7 +203,7 @@
                                     XSDTYPE type);
     int AXISCALL serializeAsElement(const AxisChar* pchName,
                                     IAnySimpleType* pSimpleType);
-	int AXISCALL serializeAsElement(const AxisChar* pchName,
+    int AXISCALL serializeAsElement(const AxisChar* pchName,
                                     const AxisChar* pNamespace,
                                     IAnySimpleType* pSimpleType);
     int AXISCALL serializeAsAttribute(const AxisChar* pName,
@@ -221,10 +221,10 @@
     int AXISCALL setBodyAsHexBinary(xsd__hexBinary body);
     int AXISCALL setBodyAsBase64Binary(xsd__base64Binary body);
     const AxisChar* AXISCALL getBodyAsString();
-	int addOutputAnyObject(AnyType* pAnyObject);
-	int serializeAnyObject(AnyType* pAnyObject);
+    int addOutputAnyObject(AnyType* pAnyObject);
+    int serializeAnyObject(AnyType* pAnyObject);
     int serializeAsChardata(void* pValue, XSDTYPE type);
-	AxisXMLString getNamespaceURL( string sNameSpace);
+    AxisXMLString getNamespaceURL( string sNameSpace);
     int deleteHeaderBlock(const AxisChar* pName, const AxisChar* pNamespace);    
 
   /**

Modified: webservices/axis/trunk/c/src/soap/URIMapping.cpp
URL: http://svn.apache.org/viewvc/webservices/axis/trunk/c/src/soap/URIMapping.cpp?rev=722783&r1=722782&r2=722783&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/URIMapping.cpp (original)
+++ webservices/axis/trunk/c/src/soap/URIMapping.cpp Tue Dec  2 21:29:56 2008
@@ -50,7 +50,7 @@
             URI_XSI;
 
         m_sURIMap[std::string("http://www.w3.org/2001/06/soap-encoding")] = URI_ENC;
-		m_sURIMap[std::string("http://schemas.xmlsoap.org/soap/encoding/")] = URI_ENC;
+        m_sURIMap[std::string("http://schemas.xmlsoap.org/soap/encoding/")] = URI_ENC;
         m_sURIMap[std::string("http://schemas.xmlsoap.org/soap/envelope/")] = 
             URI_ENVELOPE;
 
@@ -66,13 +66,13 @@
 {
     if (m_bInit)
     {
-		m_sURIMap.clear();
+        m_sURIMap.clear();
         m_bInit = false;
-	}
+    }
 }
 URITYPE URIMapping::getURI(const AxisXMLCh* uri)
 {
-	if (m_sURIMap.find(std::string(uri)) != m_sURIMap.end())
+    if (m_sURIMap.find(std::string(uri)) != m_sURIMap.end())
     {
         return m_sURIMap[std::string(uri)];
     }



Mime
View raw message