axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prest...@apache.org
Subject cvs commit: ws-axis/c/src/transport/axis3 ChannelFactory.cpp HTTPTransport.cpp
Date Tue, 25 Jan 2005 13:08:50 GMT
prestonf    2005/01/25 05:08:50

  Modified:    c/src/transport/axis3 ChannelFactory.cpp HTTPTransport.cpp
  Log:
  Hi All,
  These are modifications needed for the draft of the new http transport implementation AXIS3
(see AXISCPP-361).
  Regards,
  Fred Preston.
  
  Revision  Changes    Path
  1.8       +10 -5     ws-axis/c/src/transport/axis3/ChannelFactory.cpp
  
  Index: ChannelFactory.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/ChannelFactory.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ChannelFactory.cpp	25 Jan 2005 11:41:32 -0000	1.7
  +++ ChannelFactory.cpp	25 Jan 2005 13:08:50 -0000	1.8
  @@ -163,17 +163,22 @@
   		iLibCount = 1;
   	}
   
  +// Check that requested channel is the same as recorded channel
   	if( m_pChannel[iLibCount] == pIChannel)
   	{
  -		DELETE_OBJECT3 sDelete = (DELETE_OBJECT3) PLATFORM_GETPROCADDR( m_LibHandler[iLibCount],
DELETE_FUNCTION3);
  +// Check that recorded channel is not actually NULL
  +		if( m_pChannel[iLibCount] != NULL)
  +		{
  +			DELETE_OBJECT3 sDelete = (DELETE_OBJECT3) PLATFORM_GETPROCADDR( m_LibHandler[iLibCount],
DELETE_FUNCTION3);
   
  -		sDelete( pIChannel);
  +			sDelete( pIChannel);
   
  -		m_pChannel[iLibCount] = 0;
  +			m_pChannel[iLibCount] = 0;
   
  -		PLATFORM_UNLOADLIB( m_LibHandler[iLibCount]);
  +			PLATFORM_UNLOADLIB( m_LibHandler[iLibCount]);
   
  -		m_LibHandler[iLibCount] = 0;
  +			m_LibHandler[iLibCount] = 0;
  +		}
   
   		bSuccess = true;
   	}
  
  
  
  1.10      +4 -1      ws-axis/c/src/transport/axis3/HTTPTransport.cpp
  
  Index: HTTPTransport.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/transport/axis3/HTTPTransport.cpp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- HTTPTransport.cpp	25 Jan 2005 11:41:32 -0000	1.9
  +++ HTTPTransport.cpp	25 Jan 2005 13:08:50 -0000	1.10
  @@ -188,7 +188,10 @@
   
       m_iContentLength = 0;
   
  -	m_pActiveChannel->close();
  +	if( m_pActiveChannel != NULL)
  +	{
  +		m_pActiveChannel->close();
  +	}
   }
   
   /*
  
  
  

Mime
View raw message