axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject cvs commit: ws-axis/c/src/xml/xerces XMLParserXerces.cpp XMLParserXerces.h Makefile.am
Date Sun, 13 Jun 2004 13:23:45 GMT
damitha     2004/06/13 06:23:45

  Modified:    c/src/xml/xerces XMLParserXerces.cpp XMLParserXerces.h
                        Makefile.am
  Log:
  (null)
  
  Revision  Changes    Path
  1.2       +15 -0     ws-axis/c/src/xml/xerces/XMLParserXerces.cpp
  
  Index: XMLParserXerces.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XMLParserXerces.cpp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLParserXerces.cpp	27 May 2004 05:02:05 -0000	1.1
  +++ XMLParserXerces.cpp	13 Jun 2004 13:23:44 -0000	1.2
  @@ -76,6 +76,8 @@
   const AnyElement* XMLParserXerces::next(bool isCharData)
   {
   	bool bCanParseMore = false;
  +    try
  +    {
       if(!m_bFirstParsed)
       {
           m_pParser->parseFirst(*m_pInputSource, m_ScanToken);
  @@ -102,5 +104,18 @@
   		}
           else if (AXIS_FAIL == m_Xhandler.getStatus()) return NULL;
   		else if (!bCanParseMore) return NULL;
  +    }
  +    catch(AxisParseException& e)
  +    {
  +        throw;
  +    }
  +    catch(AxisException& e)
  +    {
  +        throw;
  +    }
  +    catch(...)
  +    {
  +        throw;
  +    }
       }
   }
  
  
  
  1.2       +2 -1      ws-axis/c/src/xml/xerces/XMLParserXerces.h
  
  Index: XMLParserXerces.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/XMLParserXerces.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLParserXerces.h	27 May 2004 05:02:05 -0000	1.1
  +++ XMLParserXerces.h	13 Jun 2004 13:23:44 -0000	1.2
  @@ -37,6 +37,7 @@
   #include <xercesc/parsers/SAXParser.hpp>
   #include <xercesc/framework/XMLPScanToken.hpp>
   #include "SoapInputSource.h"
  +#include <axis/AxisParseException.h>
   
   XERCES_CPP_NAMESPACE_USE
   
  @@ -61,4 +62,4 @@
   
   };
   
  -#endif
  \ No newline at end of file
  +#endif
  
  
  
  1.4       +2 -1      ws-axis/c/src/xml/xerces/Makefile.am
  
  Index: Makefile.am
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/xerces/Makefile.am,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Makefile.am	27 May 2004 05:02:05 -0000	1.3
  +++ Makefile.am	13 Jun 2004 13:23:44 -0000	1.4
  @@ -4,7 +4,8 @@
                              SoapInputSource.cpp \
                              XMLParserXerces.cpp \
                              ParserLoader.cpp \
  -                           XercesHandler.cpp 
  +                           XercesHandler.cpp \
  +			   ../AxisParseException.cpp
   
   libaxis_xercesc_la_LIBADD =  -L$(XERCESC_HOME)/lib -lxerces-c -lstdc++
   INCLUDES = -I$(AXISCPP_HOME)/include
  
  
  

Mime
View raw message