geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1483405 - /geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
Date Thu, 16 May 2013 15:23:31 GMT
Author: gawor
Date: Thu May 16 15:23:30 2013
New Revision: 1483405

URL: http://svn.apache.org/r1483405
Log:
merge fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=54178

Modified:
    geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/core/AsyncContextImpl.java

Modified: geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1483405&r1=1483404&r2=1483405&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
(original)
+++ geronimo/external/trunk/tomcat-parent-7.0.39/catalina/src/main/java/org/apache/catalina/core/AsyncContextImpl.java
Thu May 16 15:23:30 2013
@@ -117,9 +117,10 @@ public class AsyncContextImpl implements
             for (AsyncListenerWrapper listener : listenersCopy) {
                 try {
                     listener.fireOnComplete(event);
-                } catch (IOException ioe) {
+                } catch (Throwable t) {
+                    ExceptionUtils.handleThrowable(t);
                     log.warn("onComplete() failed for listener of type [" +
-                            listener.getClass().getName() + "]", ioe);
+                            listener.getClass().getName() + "]", t);
                 }
             }
         } finally {
@@ -148,9 +149,10 @@ public class AsyncContextImpl implements
                 for (AsyncListenerWrapper listener : listenersCopy) {
                     try {
                         listener.fireOnTimeout(event);
-                    } catch (IOException ioe) {
+                    } catch (Throwable t) {
+                        ExceptionUtils.handleThrowable(t);
                         log.warn("onTimeout() failed for listener of type [" +
-                                listener.getClass().getName() + "]", ioe);
+                                listener.getClass().getName() + "]", t);
                     }
                 }
                 request.getCoyoteRequest().action(
@@ -328,9 +330,10 @@ public class AsyncContextImpl implements
         for (AsyncListenerWrapper listener : listenersCopy) {
             try {
                 listener.fireOnStartAsync(event);
-            } catch (IOException ioe) {
+            } catch (Throwable t) {
+                ExceptionUtils.handleThrowable(t);
                 log.warn("onStartAsync() failed for listener of type [" +
-                        listener.getClass().getName() + "]", ioe);
+                        listener.getClass().getName() + "]", t);
             }
         }
         listeners.clear();
@@ -393,9 +396,10 @@ public class AsyncContextImpl implements
             for (AsyncListenerWrapper listener : listenersCopy) {
                 try {
                     listener.fireOnError(errorEvent);
-                } catch (IOException ioe) {
+                } catch (Throwable t2) {
+                    ExceptionUtils.handleThrowable(t);
                     log.warn("onError() failed for listener of type [" +
-                            listener.getClass().getName() + "]", ioe);
+                            listener.getClass().getName() + "]", t2);
                 }
             }
         }



Mime
View raw message