You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2006/10/27 05:57:08 UTC
svn commit: r468256 - in /geronimo/sandbox/gcache/server/src:
main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
Author: jgenender
Date: Thu Oct 26 20:57:07 2006
New Revision: 468256
URL: http://svn.apache.org/viewvc?view=rev&rev=468256
Log:
Fix threading model
Modified:
geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
Modified: geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java?view=diff&rev=468256&r1=468255&r2=468256
==============================================================================
--- geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java (original)
+++ geronimo/sandbox/gcache/server/src/main/java/org/apache/geronimo/gcache/transports/tcp/TCPSocketTransportService.java Thu Oct 26 20:57:07 2006
@@ -106,7 +106,6 @@
SocketAcceptorConfig cfg = new SocketAcceptorConfig();
cfg.setReuseAddress( true );
- cfg.setThreadModel( ThreadModel.MANUAL );
//If we requested logging, add that too
if (enableLogging){
cfg.getFilterChain().addLast( "logFilter", new LoggingFilter() );
Modified: geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java?view=diff&rev=468256&r1=468255&r2=468256
==============================================================================
--- geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java (original)
+++ geronimo/sandbox/gcache/server/src/test/java/org/apache/geronimo/gcache/transports/tcp/AbstractService.java Thu Oct 26 20:57:07 2006
@@ -43,8 +43,11 @@
protected String protocol = "tcp://localhost:45678";
protected TCPSocketTransportService server = null;
+
protected Socket client;
+
protected Socket client2;
+
protected CacheInfoHolder info;
@BeforeClass
@@ -64,12 +67,14 @@
//Create a client socket
client = new Socket();
- client.connect(new InetSocketAddress(uri.getHost(), uri.getPort()), 2000);
+ client.connect(new InetSocketAddress(uri.getHost(), uri.getPort()),
+ 2000);
authenticate(client);
//Create a second client socket
client2 = new Socket();
- client2.connect(new InetSocketAddress(uri.getHost(), uri.getPort()), 2000);
+ client2.connect(new InetSocketAddress(uri.getHost(), uri.getPort()),
+ 2000);
authenticate(client2);
}
@@ -105,7 +110,8 @@
MessageAckCommand ackCommand = (MessageAckCommand) readCommand(socket);
}
- protected void sendCommand(Socket socket, BaseCommand command) throws Exception {
+ protected void sendCommand(Socket socket, BaseCommand command)
+ throws Exception {
byte bytes[] = command.createPacket(true);
@@ -119,7 +125,7 @@
byte recBuf[] = new byte[Constants.HEADER_SIZE];
-// socket.setSoTimeout(2000);
+ socket.setSoTimeout(2000);
InputStream is = socket.getInputStream();
int read = is.read(recBuf);
assert read == Constants.HEADER_SIZE;