You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/03/07 02:45:57 UTC
svn commit: r383745 - in /webservices/axis/trunk/c/src/xml/xerces:
XMLParserXerces.cpp XMLParserXerces.h
Author: nadiramra
Date: Mon Mar 6 17:45:55 2006
New Revision: 383745
URL: http://svn.apache.org/viewcvs?rev=383745&view=rev
Log:
Uncommented parser exception processing for OS/400-only.
Modified:
webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.cpp
webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.h
Modified: webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.cpp?rev=383745&r1=383744&r2=383745&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.cpp (original)
+++ webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.cpp Mon Mar 6 17:45:55 2006
@@ -84,13 +84,14 @@
if( !m_bFirstParsed)
{
+// Try this again at some point in the future. At the moment it works on
+// Windows, but Linux has a problem...will keep for OS/400
+#ifndef __OS400__
+ m_pParser->parseFirst( *m_pInputSource, m_ScanToken);
+#else
+ try
+ {
m_pParser->parseFirst( *m_pInputSource, m_ScanToken);
-/*
- Try this again at some point in the future. At the moment it works on
- Windows, but Linux as a problem...
- try
- {
- m_pParser->parseFirst( *m_pInputSource, m_ScanToken);
}
catch( const XMLException& toCatch)
{
@@ -121,10 +122,10 @@
catch( ...)
{
char *pErrorMsg = "Unexpected Exception in SAX parser. Probably no message or the message is not recognised as XML.";
-
+
throw AxisParseException( CLIENT_SOAP_CONTENT_NOT_SOAP, pErrorMsg);
}
-*/
+#endif
m_bFirstParsed = true;
}
Modified: webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.h
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.h?rev=383745&r1=383744&r2=383745&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.h (original)
+++ webservices/axis/trunk/c/src/xml/xerces/XMLParserXerces.h Mon Mar 6 17:45:55 2006
@@ -38,9 +38,11 @@
#include "../AxisParseException.h"
/*
Try this again at some point in the future. At the moment it works on
-Windows, but Linux as a problem...
-#include "../../transport/axis3/HTTPTransportException.hpp"
+Windows, but Linux as a problem...will keep for OS/400.
*/
+#ifdef __OS400__
+#include "../../transport/axis3/HTTPTransportException.hpp"
+#endif
XERCES_CPP_NAMESPACE_USE