axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject cvs commit: ws-axis/c/src/engine/client Call.cpp
Date Thu, 09 Jun 2005 04:33:00 GMT
samisa      2005/06/08 21:33:00

  Modified:    c/src/engine/client Call.cpp
  Log:
  Removed commented code
  Fixed few memory leaks
  
  Revision  Changes    Path
  1.115     +5 -27     ws-axis/c/src/engine/client/Call.cpp
  
  Index: Call.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/engine/client/Call.cpp,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- Call.cpp	8 Jun 2005 04:25:07 -0000	1.114
  +++ Call.cpp	9 Jun 2005 04:32:59 -0000	1.115
  @@ -122,15 +122,9 @@
   
   Call::~Call ()
   {
  -    // Samisa: we have to cover the case of initialize has been called
  -    // but no matching unitialize. We have to ensure memory deallocation when
  -    // there is an exception, after initialize has been called.
  -    // could have been coverd though a matching call to uninitialize within 
  -    // generated code, but it is easier to cover it here
  -    // because it requires a lengthy conditional block to cover all cases
  -    // in generated code
  -     if (m_bCallInitialized) 
  -        unInitialize();
  +    m_pAxisEngine->unInitialize ();
  +    delete m_pAxisEngine;
  +    m_pAxisEngine = NULL;
   	SOAPTransportFactory::destroyTransportObject(m_pTransport);
   	m_pTransport = NULL;
       uninitialize_module();
  @@ -212,16 +206,6 @@
       try
       {
           m_nStatus = AXIS_SUCCESS;
  -       /* 
  -        if (m_pAxisEngine)
  -            delete m_pAxisEngine;
  -        m_pAxisEngine = new ClientAxisEngine ();
  -        if (!m_pAxisEngine) {
  -        	m_nStatus = AXIS_FAIL;
  -            return AXIS_FAIL;
  -        }
  -        if (AXIS_SUCCESS == m_pAxisEngine->initialize ())
  -        {*/
               MessageData *msgData = m_pAxisEngine->getMessageData ();
               if (msgData)
               {
  @@ -274,20 +258,17 @@
               }
               m_nStatus = AXIS_FAIL;
               return AXIS_FAIL;
  -        //}
           m_nStatus = AXIS_FAIL;        
           return AXIS_FAIL;
       }
       catch (AxisException& e)
       {
           e = e;
  -        /* printf(e.GetErr().c_str()); */
           m_nStatus = AXIS_FAIL;
           throw;
       }
       catch (...)
       {
  -        /* printf("Unknown exception occured in the client"); */
           m_nStatus = AXIS_FAIL;        
           throw;
       }
  @@ -296,7 +277,7 @@
   int Call::unInitialize ()
   {
       m_bCallInitialized = false;
  -    /*if (m_pAxisEngine)
  +    if (m_pAxisEngine)
       {
   		//Initialization,serialization, invokation or check message success 
   		if ( m_nStatus == AXIS_SUCCESS &&  m_pIWSDZ != NULL ) 
  @@ -323,10 +304,7 @@
                   delete [] m_pchSessionID;
               m_pchSessionID = NULL;
           }
  -        m_pAxisEngine->unInitialize ();
  -        delete m_pAxisEngine;
  -        m_pAxisEngine = NULL;
  -    }*/
  +    }
       closeConnection ();
       return AXIS_SUCCESS;
   }
  
  
  

Mime
View raw message