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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033920 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
index 2685f9a..45aeb96 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
@@ -152,6 +152,7 @@ public class BioReceiver extends ReceiverBase implements Runnable {
             socket.setSoTimeout(getTimeout());
             ObjectReader reader = new ObjectReader(socket);
             task.serviceSocket(socket,reader);
+            getExecutor().execute(task);
         }//while
     }
     

diff --git a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
index b0edbbb..50a0edf 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
+++ b/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
@@ -65,7 +65,7 @@ public class BioReplicationTask extends AbstractRxTask {
         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 AbstractRxTask {
     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{

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2c49144..93c6ede 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>