Author: ron.sigal(a)jboss.com Date: 2009-08-18 21:52:55 -0400 (Tue, 18 Aug 2009) New Revision: 5363 Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java Log: JBREM-1120: Moved SocketFactory creation from SSLBisocketServerInvoker to BisocketServerInvoker; JBREM-1140: Backed out the ping reply mechanism. Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java =================================================================== --- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-08-18 15:29:15 UTC (rev 5362) +++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/bisocket/BisocketServerInvoker.java 2009-08-19 01:52:55 UTC (rev 5363) @@ -82,7 +82,6 @@ private int socketCreationRetries = Bisocket.MAX_RETRIES_DEFAULT; private int controlConnectionRestarts = Bisocket.MAX_CONTROL_CONNECTION_RESTARTS_DEFAULT; private ControlMonitorTimerTask controlMonitorTimerTask; - private boolean enablePingReplies = false; protected boolean isCallbackServer = false; protected int secondaryBindPort = -1; protected int secondaryConnectPort = -1; @@ -203,13 +202,6 @@ secondaryServerSocketThread.start(); log.debug("started secondary port: " + host + ":" + secondaryBindPort); } - Object val = configuration.get(Bisocket.ENABLE_PING_REPLIES); - if (val != null) - { - // Boolean.valueOf doesn't throw exceptions :-) - boolean bVal = Boolean.valueOf((String) val).booleanValue(); - enablePingReplies = bVal; - } } @@ -517,6 +509,11 @@ log.warn("\"" + Bisocket.SECONDARY_CONNECT_PORT + "\" must be specified as a String"); } + if (isCallbackServer) + { + socketFactory = createSocketFactory(configuration); + } + super.setup(); } @@ -807,10 +804,6 @@ break; case Bisocket.PING: - if (enablePingReplies) - { - socket.getOutputStream().write(Bisocket.PING); - } continue; case -1: