[jboss-remoting-commits] JBoss Remoting SVN: r4009 - in remoting3/trunk: core/src/main/java/org/jboss/cx/remoting/core and 2 other directories.

Author: david.lloyd(a)jboss.com Date: 2008-04-18 11:16:59 -0400 (Fri, 18 Apr 2008) New Revision: 4009 Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java Log: openSession really means that the remote side is ready to receive messages, so rename the method accordingly Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java =================================================================== --- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 14:59:24 UTC (rev 4008) +++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-04-18 15:16:59 UTC (rev 4009) @@ -43,7 +43,7 @@ void receiveStreamData(StreamIdentifier streamIdentifier, ObjectMessageInput data); - void openSession(String remoteEndpointName); + void receiveRemoteSideReady(String remoteEndpointName); void closeSession(); Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 14:59:24 UTC (rev 4008) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-04-18 15:16:59 UTC (rev 4009) @@ -333,7 +333,11 @@ throw new NullPointerException("streamIdentifier is null"); } final CoreStream coreStream = streams.remove(streamIdentifier); - // todo - shut down stream + try { + coreStream.getStreamSerializer().handleClose(); + } catch (IOException e) { + log.trace(e, "Failed to close the stream"); + } } public void receiveServiceClose(ServiceIdentifier serviceIdentifier) { @@ -507,7 +511,7 @@ } @SuppressWarnings ({"unchecked"}) - public void openSession(String remoteEndpointName) { + public void receiveRemoteSideReady(String remoteEndpointName) { state.waitFor(State.CONNECTING); state.requireTransitionExclusive(State.CONNECTING, State.UP); try { Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java 2008-04-18 14:59:24 UTC (rev 4008) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/protocol/LocalProtocolHandlerFactory.java 2008-04-18 15:16:59 UTC (rev 4009) @@ -47,8 +47,8 @@ final LocalProtocolHandler otherProtocolHandler = new LocalProtocolHandler(ourProtocolContext, otherEndpointName); final ProtocolContext otherProtocolContext = otherEndpoint.openIncomingSession(otherProtocolHandler); final LocalProtocolHandler ourProtocolHandler = new LocalProtocolHandler(otherProtocolContext, endpointName); - otherProtocolContext.openSession(endpointName); - ourProtocolContext.openSession(otherEndpointName); + otherProtocolContext.receiveRemoteSideReady(endpointName); + ourProtocolContext.receiveRemoteSideReady(otherEndpointName); return ourProtocolHandler; } Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-18 14:59:24 UTC (rev 4008) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-04-18 15:16:59 UTC (rev 4009) @@ -762,7 +762,7 @@ saslServerFilter.startEncryption(ioSession); log.trace("Server transitioning to UP state"); state.requireTransition(State.AWAITING_CLIENT_RESPONSE, State.UP); - protocolContext.openSession(remoteName); + protocolContext.receiveRemoteSideReady(remoteName); } } catch (SaslException ex) { final IoBuffer buffer = newBuffer(100, true); @@ -811,7 +811,7 @@ output.commit(); log.trace("Server transitioning to UP state (immediate)"); state.requireTransition(State.UP); - protocolContext.openSession(remoteName); + protocolContext.receiveRemoteSideReady(remoteName); } else { state.requireTransition(State.AWAITING_CLIENT_RESPONSE); } @@ -874,7 +874,7 @@ saslClientFilter.startEncryption(ioSession); log.trace("Client transitioning to UP state"); state.requireTransition(State.AWAITING_SERVER_CHALLENGE, State.UP); - protocolContext.openSession(remoteName); + protocolContext.receiveRemoteSideReady(remoteName); return; } case AUTH_FAILED: {