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 su...@apache.org on 2004/03/08 07:48:18 UTC

cvs commit: ws-axis/c/src/soap SoapDeSerializer.cpp

susantha    2004/03/07 22:48:18

  Modified:    c/src/soap SoapDeSerializer.cpp
  Log:
  Applying some patches sent by Jean-Yves to Axis runtime
  
  Revision  Changes    Path
  1.29      +9 -3      ws-axis/c/src/soap/SoapDeSerializer.cpp
  
  Index: SoapDeSerializer.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/soap/SoapDeSerializer.cpp,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- SoapDeSerializer.cpp	28 Feb 2004 06:27:56 -0000	1.28
  +++ SoapDeSerializer.cpp	8 Mar 2004 06:48:18 -0000	1.29
  @@ -836,6 +836,12 @@
   				}
   			}
   		}
  +		else if ( GetAttributeAsBoolean("nil",0) == true_ ) 
  +		{
  +			m_pParser->Next();
  +			m_pNode = NULL;
  +			return NULL;
  +		}
   		else
   		{
   			m_nStatus = AXIS_FAIL; /* unexpected SOAP stream */
  @@ -886,7 +892,7 @@
   		{\
   			if (0 == strcmp(m_pCurrNode->m_pchAttributes[i], pName))\
   			{\
  -				ret = conv_func(m_pCurrNode->m_pchAttributes[i]);\
  +				ret = conv_func(m_pCurrNode->m_pchAttributes[i+2]);\
   				return ret;\
   			}\
   		}\
  @@ -917,7 +923,7 @@
   		{
   			if (0 == strcmp(m_pCurrNode->m_pchAttributes[i], pName))
   			{
  -				ret = strtol(m_pCurrNode->m_pchAttributes[i], &m_pEndptr, 10);
  +				ret = strtol(m_pCurrNode->m_pchAttributes[i+2], &m_pEndptr, 10);
   				return ret;
   			}
   		}	
  @@ -944,7 +950,7 @@
   		{
   			if (0 == strcmp(m_pCurrNode->m_pchAttributes[i], pName))
   			{
  -				ret = (0 == strcmp(m_pCurrNode->m_pchAttributes[i], "true")) ? true_: false_;
  +				ret = (0 == strcmp(m_pCurrNode->m_pchAttributes[i+2], "true")) ? true_: false_;
   				return ret;
   			}
   		}