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 ro...@apache.org on 2004/04/10 08:35:20 UTC

cvs commit: ws-axis/c/samples/server/echoStringHeaderHandler ESHHandler.cpp

roshan      2004/04/09 23:35:20

  Modified:    c/samples/client/testHandler THandler.cpp
               c/samples/server/echoStringHeaderHandler ESHHandler.cpp
  Log:
  Fixes for sample handlers
  
  Revision  Changes    Path
  1.2       +7 -4      ws-axis/c/samples/client/testHandler/THandler.cpp
  
  Index: THandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/client/testHandler/THandler.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- THandler.cpp	31 Mar 2004 14:48:58 -0000	1.1
  +++ THandler.cpp	10 Apr 2004 06:35:20 -0000	1.2
  @@ -124,10 +124,13 @@
   
   		IHeaderBlock* pIHeaderBlock= pISZ->createHeaderBlock();
   
  -		pIHeaderBlock->setLocalName("testClientHandlerHeader");
  -		pIHeaderBlock->setUri("http://opensource.lk/testClientHandlerHeader/");
  -        
  -		const AxisChar* pachHeaderVal = "test Header Val";
  +		//pIHeaderBlock->setLocalName("testClientHandlerHeader");
  +		//pIHeaderBlock->setUri("http://opensource.lk/testClientHandlerHeader/");
  +
  +		pIHeaderBlock->setLocalName("echoMeString");
  +                pIHeaderBlock->setUri("http://soapinterop.org/echoheader/");
  +
  +       		const AxisChar* pachHeaderVal = "test Header Val";
   
   		BasicNode* pBasicNode = pIHeaderBlock->createChild(CHARACTER_NODE);
   		pBasicNode->setValue(pachHeaderVal);
  
  
  
  1.11      +12 -17    ws-axis/c/samples/server/echoStringHeaderHandler/ESHHandler.cpp
  
  Index: ESHHandler.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/samples/server/echoStringHeaderHandler/ESHHandler.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ESHHandler.cpp	9 Apr 2004 06:52:32 -0000	1.10
  +++ ESHHandler.cpp	10 Apr 2004 06:35:20 -0000	1.11
  @@ -139,33 +139,28 @@
   		IHandlerSoapDeSerializer* pIHandlerSoapDeSerializer;
   		pIMsg->getSoapDeSerializer(&pIHandlerSoapDeSerializer);
   
  -		IHeaderBlock* pIHeaderBlock= pIHandlerSoapDeSerializer->GetHeaderBlock("reservation", "http://travelcompany.example.org/reservation");
  +		IHeaderBlock* pIHeaderBlock= pIHandlerSoapDeSerializer->GetHeaderBlock("echoMeString", "http://soapinterop.org/echoheader/");
   		
   		if (pIHeaderBlock != NULL) {
   
   			const BasicNode* pBasicNode= pIHeaderBlock->getFirstChild();
  -			const BasicNode* pBasicNode2= pBasicNode->getFirstChild();
   						
   			const AxisChar* pachHeaderValue;
  -			const AxisChar* pachHeaderValue2;
  -			if((pBasicNode2->getNodeType()) == CHARACTER_NODE) {
  -				pachHeaderValue= pBasicNode2->getValue();
  -			} else {
  -				pachHeaderValue = "This was not the expected value Ros";
  -			}
   
  -			const BasicNode* pBasicNode3= pIHeaderBlock->getLastChild();
  -			const BasicNode* pBasicNode4 =pBasicNode3->getFirstChild();
  -			if((pBasicNode4->getNodeType()) == CHARACTER_NODE) {
  -				pachHeaderValue2= pBasicNode4->getValue();
  -			} else {
  -				pachHeaderValue2= "This was not the expected value2 Ros";
  +			if (pBasicNode != NULL) 
  +			{
  +				if((pBasicNode->getNodeType()) == CHARACTER_NODE) {
  +					pachHeaderValue= pBasicNode->getValue();
  +				} else {
  +					pachHeaderValue = "This was not the expected value Ros";
  +				}
  +			} else 
  +			{
  +				pachHeaderValue = "pBascNode is NULL";
   			}
   
  -			AxisChar* pachTmpValue = (AxisChar*) malloc(strlen(pachHeaderValue)+ strlen(pachHeaderValue2) +4);
  +			AxisChar* pachTmpValue = (AxisChar*) malloc(strlen(pachHeaderValue) + 4);
   			strcpy(pachTmpValue, pachHeaderValue);
  -			strcat(pachTmpValue, " : ");
  -			strcat(pachTmpValue, pachHeaderValue2);
   
   			pachTemp = "EchoStringHeaderHandlerPr1.id";
   			pIMsg->setProperty(pachTemp, pachTmpValue);