tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1033920 - in /tomcat/trunk: java/org/apache/catalina/tribes/transport/bio/BioReceiver.java java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java webapps/docs/changelog.xml
Date Thu, 11 Nov 2010 12:51:35 GMT
Author: markt
Date: Thu Nov 11 12:51:35 2010
New Revision: 1033920

URL: http://svn.apache.org/viewvc?rev=1033920&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50183
BIO sender was not scheduling tasks to the executor during normal operation.
Patch provided by Ariel.

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1033920&r1=1033919&r2=1033920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Thu Nov 11
12:51:35 2010
@@ -152,6 +152,7 @@ public class BioReceiver extends Receive
             socket.setSoTimeout(getTimeout());
             ObjectReader reader = new ObjectReader(socket);
             task.serviceSocket(socket,reader);
+            getExecutor().execute(task);
         }//while
     }
     

Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1033920&r1=1033919&r2=1033920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java Thu
Nov 11 12:51:35 2010
@@ -65,7 +65,7 @@ public class BioReplicationTask extends 
         try {
             drainSocket();
         } catch ( Exception x ) {
-            log.error("Unable to service bio socket");
+            log.error("Unable to service bio socket", x);
         }finally {
             try {socket.close();}catch ( Exception e){/* Ignore */}
             try {reader.close();}catch ( Exception e){/* Ignore */}
@@ -80,7 +80,6 @@ public class BioReplicationTask extends 
     public synchronized void serviceSocket(Socket socket, ObjectReader reader) {
         this.socket = socket;
         this.reader = reader;
-        this.notify();      // awaken the thread
     }
     
     protected void execute(ObjectReader reader) throws Exception{

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033920&r1=1033919&r2=1033920&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 11 12:51:35 2010
@@ -183,9 +183,13 @@
         (kfujino)
       </fix>
       <fix>
+        <bug>50183</bug>: BIO sender was not scheduling tasks to the executor
+        during normal operation. Patch provided by Ariel. (markt)
+      </fix>
+      <fix>
         <bug>50184</bug>: Add an option to the RpcChannel to enable the Channel
         send options to be set for the reply message. Based on a patch by Ariel.
-        (markt))
+        (markt)
       </fix>
     </changelog>
   </subsection>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message