[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/socketfactory ...
Ron Sigal
ron_sigal at yahoo.com
Tue Jan 16 18:18:17 EST 2007
User: rsigal
Date: 07/01/16 18:18:17
Modified: src/main/org/jboss/remoting/socketfactory Tag:
remoting_2_x
CreationListenerServerSocketFactory.java
SocketCreationListener.java
CreationListenerSocketFactory.java
CreationListenerServerSocket.java
Log:
JBREM-298: Added second argument, source, to SocketCreationListener.
Revision Changes Path
No revision
No revision
1.1.2.2 +26 -2 JBossRemoting/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocketFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreationListenerServerSocketFactory.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocketFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- CreationListenerServerSocketFactory.java 16 Jan 2007 05:52:56 -0000 1.1.2.1
+++ CreationListenerServerSocketFactory.java 16 Jan 2007 23:18:17 -0000 1.1.2.2
@@ -34,7 +34,7 @@
* CreationListenerServerSocket.
*
* @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
* <p>
* Copyright Jan 10, 2007
* </p>
@@ -57,6 +57,30 @@
}
+ public ServerSocketFactory getFactory()
+ {
+ return factory;
+ }
+
+
+ public SocketCreationListener getListener()
+ {
+ return listener;
+ }
+
+
+ public void setFactory(ServerSocketFactory factory)
+ {
+ this.factory = factory;
+ }
+
+
+ public void setListener(SocketCreationListener listener)
+ {
+ this.listener = listener;
+ }
+
+
public ServerSocket createServerSocket() throws IOException
{
ServerSocket serverSocket = factory.createServerSocket();
1.1.2.2 +11 -2 JBossRemoting/src/main/org/jboss/remoting/socketfactory/SocketCreationListener.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SocketCreationListener.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/socketfactory/SocketCreationListener.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- SocketCreationListener.java 16 Jan 2007 05:52:56 -0000 1.1.2.1
+++ SocketCreationListener.java 16 Jan 2007 23:18:17 -0000 1.1.2.2
@@ -25,13 +25,22 @@
import java.net.Socket;
/**
+ * Interface for a listener that is called when a socket is created.
+ *
* @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
* <p>
* Copyright Jan 10, 2007
* </p>
*/
public interface SocketCreationListener
{
- void socketCreated(Socket socket) throws IOException;
+ /**
+ * Called when a socket has been created.
+ *
+ * @param socket socket that has been created
+ * @param source SocketFactory or ServerSocket that created the socket
+ * @throws IOException
+ */
+ void socketCreated(Socket socket, Object source) throws IOException;
}
1.1.2.2 +30 -7 JBossRemoting/src/main/org/jboss/remoting/socketfactory/CreationListenerSocketFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreationListenerSocketFactory.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/socketfactory/CreationListenerSocketFactory.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- CreationListenerSocketFactory.java 16 Jan 2007 05:52:56 -0000 1.1.2.1
+++ CreationListenerSocketFactory.java 16 Jan 2007 23:18:17 -0000 1.1.2.2
@@ -35,7 +35,7 @@
* of the creation of a Socket before returning the socket.
*
* @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1.2.1 $
+ * @version $Revision: 1.1.2.2 $
* <p>
* Copyright Jan 10, 2007
* </p>
@@ -62,12 +62,35 @@
this.listener = listener;
}
+ public SocketFactory getFactory()
+ {
+ return factory;
+ }
+
+
+ public SocketCreationListener getListener()
+ {
+ return listener;
+ }
+
+
+ public void setFactory(SocketFactory factory)
+ {
+ this.factory = factory;
+ }
+
+
+ public void setListener(SocketCreationListener listener)
+ {
+ this.listener = listener;
+ }
+
public Socket createSocket() throws IOException
{
checkFactory();
Socket socket = factory.createSocket();
- listener.socketCreated(socket);
+ listener.socketCreated(socket, factory);
return socket;
}
@@ -77,7 +100,7 @@
{
checkFactory();
Socket socket = factory.createSocket(host, port);
- listener.socketCreated(socket);
+ listener.socketCreated(socket, factory);
return socket;
}
@@ -87,7 +110,7 @@
{
checkFactory();
Socket socket = factory.createSocket(host, port, clientHost, clientPort);
- listener.socketCreated(socket);
+ listener.socketCreated(socket, factory);
return socket;
}
@@ -96,7 +119,7 @@
{
checkFactory();
Socket socket = factory.createSocket(host, port);
- listener.socketCreated(socket);
+ listener.socketCreated(socket, factory);
return socket;
}
@@ -106,7 +129,7 @@
{
checkFactory();
Socket socket = factory.createSocket(address, port, clientAddress, clientPort);
- listener.socketCreated(socket);
+ listener.socketCreated(socket, factory);
return socket;
}
@@ -134,7 +157,7 @@
if (factory instanceof SSLSocketFactory)
{
Socket socket = ((SSLSocketFactory) factory).createSocket(s, host, port, autoClose);
- listener.socketCreated(socket);
+ listener.socketCreated(socket, factory);
return socket;
}
else
1.1.2.3 +26 -2 JBossRemoting/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocket.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CreationListenerServerSocket.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/socketfactory/CreationListenerServerSocket.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- CreationListenerServerSocket.java 16 Jan 2007 08:59:21 -0000 1.1.2.2
+++ CreationListenerServerSocket.java 16 Jan 2007 23:18:17 -0000 1.1.2.3
@@ -35,7 +35,7 @@
* accept(), a SocketCreationListener is notified before the Socket is returned.
*
* @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1.2.2 $
+ * @version $Revision: 1.1.2.3 $
* <p>
* Copyright Jan 10, 2007
* </p>
@@ -54,6 +54,30 @@
}
+ public SocketCreationListener getListener()
+ {
+ return listener;
+ }
+
+
+ public ServerSocket getServerSocket()
+ {
+ return serverSocket;
+ }
+
+
+ public void setListener(SocketCreationListener listener)
+ {
+ this.listener = listener;
+ }
+
+
+ public void setServerSocket(ServerSocket serverSocket)
+ {
+ this.serverSocket = serverSocket;
+ }
+
+
public void bind(SocketAddress endpoint) throws IOException
{
serverSocket.bind(endpoint);
@@ -69,7 +93,7 @@
public Socket accept() throws IOException
{
Socket socket = serverSocket.accept();
- listener.socketCreated(socket);
+ listener.socketCreated(socket, serverSocket);
return socket;
}
More information about the jboss-cvs-commits
mailing list