Update of /cvsroot/openorb/SSL/src/main/org/openorb/orb/csiv2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27627/src/main/org/openorb/orb/csiv2
Modified Files:
CSITransportServerInitializer.java
Log Message:
renamed method getState() in subclasses of Thread to allow compilation on JDK 1.5
Index: CSITransportServerInitializer.java
===================================================================
RCS file: /cvsroot/openorb/SSL/src/main/org/openorb/orb/csiv2/CSITransportServerInitializer.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CSITransportServerInitializer.java 19 Feb 2004 06:35:36 -0000 1.13
+++ CSITransportServerInitializer.java 19 Nov 2004 22:43:04 -0000 1.14
@@ -410,7 +410,7 @@
// remove the thread from the list
itt.remove();
// check whether the handshake has been finished successfully
- if ( hst.getState() )
+ if ( hst.hasHandshakeCompletedSuccessfully() )
{
// return the Transport instance to the caller
SSLTransport trans = new SSLTransport( hst.getSocket(),
@@ -515,13 +515,13 @@
{
private SSLSocket m_socket;
private SSLAssociation m_association;
- private boolean m_state;
+ private boolean m_handshakeCompletedSuccessfully;
public SSLHandshakeThread( SSLSocket sock, SSLAssociation assoc )
{
m_socket = sock;
m_association = assoc;
- m_state = false;
+ m_handshakeCompletedSuccessfully = false;
m_socket.addHandshakeCompletedListener( m_association.getHandshakeCompletedListener() );
}
@@ -536,9 +536,9 @@
return m_association;
}
- public boolean getState()
+ public boolean hasHandshakeCompletedSuccessfully()
{
- return m_state;
+ return m_handshakeCompletedSuccessfully;
}
public void run()
@@ -546,7 +546,7 @@
try
{
m_socket.startHandshake();
- m_state = true;
+ m_handshakeCompletedSuccessfully = true;
}
catch ( java.io.IOException ex )
{
@@ -561,7 +561,7 @@
getLogger().error( "IOException closing socket: " + ex );
}
- m_state = false;
+ m_handshakeCompletedSuccessfully = false;
}
}
}
|
