You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/09/30 14:46:26 UTC
svn commit: r580715 - in /geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base: BaseService.java BaseTransport.java BaseTransportServer.java

Author: jdillon
Date: Sun Sep 30 05:46:25 2007
New Revision: 580715

URL: http://svn.apache.org/viewvc?rev=580715&view=rev
Log:
Put my named thread pool model back

Modified:
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java
    geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java?rev=580715&r1=580714&r2=580715&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseService.java Sun Sep 30 05:46:25 2007
@@ -100,7 +100,7 @@
     private ThreadModel threadModel;
 
     protected synchronized ThreadModel createThreadModel() throws Exception {
-        return getBaseConfiguration().getThreadModel();
+        return null;
     }
 
     protected synchronized ThreadModel getThreadModel() throws Exception {

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java?rev=580715&r1=580714&r2=580715&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransport.java Sun Sep 30 05:46:25 2007
@@ -29,6 +29,7 @@
 import org.apache.geronimo.gshell.whisper.message.Message;
 import org.apache.geronimo.gshell.whisper.request.Requestor;
 import org.apache.geronimo.gshell.whisper.session.SessionAttributeBinder;
+import org.apache.geronimo.gshell.whisper.session.ThreadPoolModel;
 import org.apache.geronimo.gshell.whisper.stream.SessionInputStream;
 import org.apache.geronimo.gshell.whisper.stream.SessionOutputStream;
 import org.apache.geronimo.gshell.whisper.transport.Transport;
@@ -38,6 +39,7 @@
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.common.WriteFuture;
+import org.apache.mina.common.ThreadModel;
 
 /**
  * Support for {@link Transport} implementations.
@@ -102,6 +104,11 @@
     @Override
     protected synchronized BaseConfiguration getBaseConfiguration() {
         return (BaseConfiguration) getConfiguration();
+    }
+
+    @Override
+    protected synchronized ThreadModel createThreadModel() throws Exception {
+        return new ThreadPoolModel(getClass(), INSTANCE_COUNTER);
     }
 
     //

Modified: geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java?rev=580715&r1=580714&r2=580715&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java (original)
+++ geronimo/sandbox/gshell/trunk/gshell-whisper/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/BaseTransportServer.java Sun Sep 30 05:46:25 2007
@@ -24,8 +24,10 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.geronimo.gshell.whisper.transport.TransportServer;
+import org.apache.geronimo.gshell.whisper.session.ThreadPoolModel;
 import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.ThreadModel;
 
 /**
  * Support for {@link TransportServer} implementations.
@@ -84,6 +86,15 @@
         return (BaseConfiguration) getConfiguration();
     }
 
+    @Override
+    protected synchronized ThreadModel createThreadModel() throws Exception {
+        return new ThreadPoolModel(getClass(), INSTANCE_COUNTER);
+    }
+
+    //
+    // Acceptor
+    //
+    
     protected abstract T createAcceptor() throws Exception;
 
     synchronized void bind(final URI location) throws Exception {