Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
Date: 22 Aug 2005 06:05:33 -0000
Message-ID: <20050822060533.95154.qmail@minotaur.apache.org>
From: samisa@apache.org
To: ws-axis-cvs@apache.org
Subject: cvs commit: ws-axis/c/src/engine Axis.cpp

samisa      2005/08/21 23:05:33

  Modified:    c/src/engine Axis.cpp
  Log:
  Removed the call to SOAPTransportFactory::initialize(); when initing server side as this is not required on server.
  
  Fix for AXISCPP-104
  
  Revision  Changes    Path
  1.99      +10 -26    ws-axis/c/src/engine/Axis.cpp
  
  Index: Axis.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/Axis.cpp,v
  retrieving revision 1.98
  retrieving revision 1.99
  diff -u -r1.98 -r1.99
  --- Axis.cpp	28 Jul 2005 10:47:50 -0000	1.98
  +++ Axis.cpp	22 Aug 2005 06:05:33 -0000	1.99
  @@ -348,26 +348,18 @@
               ModuleInitialize ();
               if (bServer) // no client side wsdd processing at the moment
               {
  -    		    /* Read from the configuration file */
  +    		    // Read from the configuration file
                   status = g_pConfig->readConfFile (); 
                   if (status == AXIS_SUCCESS)
  -                {
  -					//chinthana:Axiscpp-104
  -                    //XMLParserFactory::initialize();
  -                    //SOAPTransportFactory::initialize();
  +                {					
   					try
   					{            
   						XMLParserFactory::initialize();
  -						SOAPTransportFactory::initialize();
  -					}
  -					catch (exception& e)
  -					{
  -						cout<< e.what();
  -						cout<< "\n";
  -						cout<< "Axis c++: An exception occured while initializing the XML Parser and SOAP Transport\n";
  -						exit(1);
   					}
  -					//.........................................
  +					catch (AxisException& e)
  +                    {
  +                        throw AxisEngineException(e.getExceptionCode(), e.what());
  +                    }
   
                       char *pWsddPath = g_pConfig->getAxisConfProperty(AXCONF_WSDDFILEPATH);
   #if defined(ENABLE_AXISTRACE)
  @@ -375,7 +367,7 @@
                       if (status == AXIS_FAIL)
                       {
                           // Samisa - make sure that we start service, even if we cannot open log file
  -                        //return AXIS_FAIL;
  +                        // Hence do not return from here, may be we can log an error here
                       }
   #endif
                       try
  @@ -398,22 +390,14 @@
              }
              else if (bServer == 0)      // client side module initialization
              {
  -                status = g_pConfig->readConfFile (); /* Read from the configuration
  -                               * file 
  -                                 */
  +                status = g_pConfig->readConfFile (); //Read from the configuration file 
  +
                   if (status == AXIS_SUCCESS)
                   {
   #if defined(ENABLE_AXISTRACE)
                       status = AxisTrace::openFileByClient ();
  -                    /*  //Samisa: 01/09/2004
  -                        //Fix for AXISCPP-127
  -                        //Do not stop here merely because log file location ClientLogPath is incorrect
  -                        if (status == AXIS_FAIL)
  -                        {
  -                            return AXIS_FAIL;
  -                        }
  -                   */
   #endif
  +
                      XMLParserFactory::initialize();
                      SOAPTransportFactory::initialize();
                      char *pClientWsddPath =