Return-Path: 
 <axis-cvs-return-14114-apmail-ws-axis-cvs-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-cvs-archive@www.apache.org
Received: (qmail 64525 invoked from network); 5 Apr 2006 13:55:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Apr 2006 13:55:55 -0000
Received: (qmail 4944 invoked by uid 500); 5 Apr 2006 13:55:37 -0000
Delivered-To: apmail-ws-axis-cvs-archive@ws.apache.org
Received: (qmail 4883 invoked by uid 500); 5 Apr 2006 13:55:37 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
List-Post: <mailto:axis-cvs@ws.apache.org>
List-Id: <axis-cvs.ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 4872 invoked by uid 99); 5 Apr 2006 13:55:37 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2006 06:55:37 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 05 Apr 2006 06:55:36 -0700
Received: (qmail 63815 invoked by uid 65534); 5 Apr 2006 13:55:09 -0000
Message-ID: <20060405135509.63812.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r391615 -
 /webservices/axis/trunk/c/src/soap/SoapFault.cpp
Date: Wed, 05 Apr 2006 13:55:08 -0000
To: axis-cvs@ws.apache.org
From: dicka@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: dicka
Date: Wed Apr  5 06:55:07 2006
New Revision: 391615

URL: http://svn.apache.org/viewcvs?rev=391615&view=rev
Log:
AXISCPP-706

Update to the fix applied, as it was only applied to faults containing complex detail, when it should have only been for faults containing simple detail(ie text element, not XML tags).

This was causing FaultMappingDoc and FaultMappingRepeatedDoc testcases to fail when testing against SimpleAxisServer.

Also, took the opportunity to remove some redundant code from this method.

Modified:
    webservices/axis/trunk/c/src/soap/SoapFault.cpp

Modified: webservices/axis/trunk/c/src/soap/SoapFault.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/soap/SoapFault.cpp?rev=391615&r1=391614&r2=391615&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/soap/SoapFault.cpp (original)
+++ webservices/axis/trunk/c/src/soap/SoapFault.cpp Wed Apr  5 06:55:07 2006
@@ -60,36 +60,10 @@
 
 int SoapFault::serialize(SoapSerializer& pSZ, SOAP_VERSION eSoapVersion)
 {
-    // written according to SOAP Version 1.1 
+    // written according to SOAP Version 1.1
     int iStatus= AXIS_SUCCESS;
-    if(m_bIsSimpleDetail)
-    {
-        pSZ.setStyle(DOC_LITERAL);
+    pSZ.setStyle(DOC_LITERAL);
     pSZ.serialize("<", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix, ":",
-        gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL); 
-	
-    m_pFaultcodeParam->serialize(pSZ);
-    m_pFaultstringParam->serialize(pSZ);
-
-    if(m_pFaultactorParam)
-    {        
-        m_pFaultactorParam->serialize(pSZ);
-    } 
-
-	
-	if(m_pFaultDetail) 
-	{ 
-		pSZ.serialize("<detail>", NULL); 
-		m_pFaultDetail->serialize(pSZ); 
-		pSZ.serialize("</detail>\n", NULL); 
-	} 
-    
-	pSZ.serialize("</", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix, ":",
-		gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL); 
-    }
-    else
-    {
-        pSZ.serialize("<", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix, ":",
         gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL);
 
     m_pFaultcodeParam->serialize(pSZ);
@@ -100,24 +74,25 @@
         m_pFaultactorParam->serialize(pSZ);
     }
 
-	//Chinthana:Changed the code to solved Issue AXISCPP-706. 
-    /*if(m_pFaultDetail)
+    if(m_pFaultDetail)
     {
-         pSZ.serialize("<detail>", NULL);
-            m_pFaultDetail->serialize(pSZ);
-            pSZ.serialize("</detail>\n", NULL);
-    }*/
-	if(m_pFaultDetail) 
-	{ 
-		pSZ.serialize("<detail><appSpecific>", NULL); 
-		m_pFaultDetail->serialize(pSZ); 
-		pSZ.serialize("</appSpecific></detail>\n", NULL); 
-	} 
-	//22/06/2005.........................................
+        pSZ.serialize("<detail>", NULL);
 
-        pSZ.serialize("</", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix, ":",
-                gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL);
+        if(m_bIsSimpleDetail) // Fix for AXISCPP-706
+        {
+            pSZ.serialize("<appSpecific>", NULL);
+        }
+        m_pFaultDetail->serialize(pSZ);
+        if(m_bIsSimpleDetail) // Fix for AXISCPP-706
+        {
+            pSZ.serialize("</appSpecific>", NULL);
+        }
+        pSZ.serialize("</detail>\n", NULL);
     }
+
+    pSZ.serialize("</", gs_SoapEnvVersionsStruct[eSoapVersion].pchPrefix, ":",
+        gs_SoapEnvVersionsStruct[eSoapVersion].pchWords[SKW_FAULT], ">\n", NULL);
+
     return iStatus;
 }