Add a boolean return to the abstract processSocket() method facilitat…

…e the merging of the two processSocket() methods in each of the end points. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1746495 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 1, 2016 · b5f3d47 · b5f3d47
1 parent 8c3614b
commit b5f3d47
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -774,8 +774,10 @@ protected void unlockAccept() {
      * @param socketStatus  The input status to the processing
      * @param dispatch      Should the processing be performed on a new
      *                          container thread
+     *
+     * @return if processing was triggered successfully
      */
-    public abstract void processSocket(SocketWrapperBase<S> socketWrapper,
+    public abstract boolean processSocket(SocketWrapperBase<S> socketWrapper,
             SocketEvent socketStatus, boolean dispatch);
 
 

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -833,7 +833,7 @@ public boolean processSocket(long socket, SocketEvent status) {
 
 
     @Override
-    public void processSocket(SocketWrapperBase<Long> socket, SocketEvent status,
+    public boolean processSocket(SocketWrapperBase<Long> socket, SocketEvent status,
             boolean dispatch) {
         try {
             // Synchronisation is required here as this code may be called as a
@@ -850,12 +850,15 @@ public void processSocket(SocketWrapperBase<Long> socket, SocketEvent status,
             }
         } catch (RejectedExecutionException ree) {
             log.warn(sm.getString("endpoint.executor.fail", socket) , ree);
+            return false;
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
             // This means we got an OOM or similar creating a thread, or that
             // the pool and its queue are full
             log.error(sm.getString("endpoint.process.fail"), t);
+            return false;
         }
+        return true;
     }
 
     private void closeSocket(long socket) {

diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -377,9 +377,9 @@ protected boolean isWorkerAvailable() {
     }
 
     @Override
-    public void processSocket(SocketWrapperBase<Nio2Channel> socketWrapper,
+    public boolean  processSocket(SocketWrapperBase<Nio2Channel> socketWrapper,
             SocketEvent socketStatus, boolean dispatch) {
-        processSocket0(socketWrapper, socketStatus, dispatch);
+        return processSocket0(socketWrapper, socketStatus, dispatch);
     }
 
     protected boolean processSocket0(SocketWrapperBase<Nio2Channel> socketWrapper, SocketEvent status, boolean dispatch) {

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -434,9 +434,9 @@ protected boolean isWorkerAvailable() {
 
 
     @Override
-    public void processSocket(SocketWrapperBase<NioChannel> socketWrapper,
+    public boolean processSocket(SocketWrapperBase<NioChannel> socketWrapper,
             SocketEvent event, boolean dispatch) {
-        processSocket((NioSocketWrapper) socketWrapper, event, dispatch);
+        return processSocket((NioSocketWrapper) socketWrapper, event, dispatch);
     }
 
     protected boolean processSocket(NioSocketWrapper socketWrapper, SocketEvent event, boolean dispatch) {