Author: markt
Date: Tue Feb 10 20:21:38 2015
New Revision: 1658794
URL: http://svn.apache.org/r1658794
Log:
Make code calling user provided listeners more robust.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 10 20:21:38 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java?rev=1658794&r1=1658793&r2=1658794&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java
Tue Feb 10 20:21:38 2015
@@ -93,23 +93,9 @@ public abstract class AbstractProcessor<
throws IOException {
if (status == SocketStatus.OPEN_READ) {
- try {
- upgradeServletInputStream.onDataAvailable();
- } catch (IOException ioe) {
- // The error handling within the ServletInputStream should have
- // marked the stream for closure which will get picked up
below,
- // triggering the clean-up of this processor.
-
getLog().debug(sm.getString("abstractProcessor.onDataAvailableFail"), ioe);
- }
+ upgradeServletInputStream.onDataAvailable();
} else if (status == SocketStatus.OPEN_WRITE) {
- try {
- upgradeServletOutputStream.onWritePossible();
- } catch (IOException ioe) {
- // The error handling within the ServletOutputStream should
have
- // marked the stream for closure which will get picked up
below,
- // triggering the clean-up of this processor.
-
getLog().debug(sm.getString("abstractProcessor.onWritePossibleFail"), ioe);
- }
+ upgradeServletOutputStream.onWritePossible();
} else if (status == SocketStatus.STOP) {
try {
upgradeServletInputStream.close();
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java?rev=1658794&r1=1658793&r2=1658794&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletInputStream.java
Tue Feb 10 20:21:38 2015
@@ -21,10 +21,14 @@ import java.io.IOException;
import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
public abstract class AbstractServletInputStream extends ServletInputStream {
+ private static final Log log =
LogFactory.getLog(AbstractServletInputStream.class);
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -182,7 +186,7 @@ public abstract class AbstractServletInp
}
- protected final void onDataAvailable() throws IOException {
+ final void onDataAvailable() {
if (listener == null) {
return;
}
@@ -192,6 +196,9 @@ public abstract class AbstractServletInp
try {
thread.setContextClassLoader(applicationLoader);
listener.onDataAvailable();
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ onError(t);
} finally {
thread.setContextClassLoader(originalClassLoader);
}
@@ -207,14 +214,24 @@ public abstract class AbstractServletInp
try {
thread.setContextClassLoader(applicationLoader);
listener.onError(t);
+ } catch (Throwable t2) {
+ ExceptionUtils.handleThrowable(t2);
+ log.warn(sm.getString("upgrade.sis.onErrorFail"), t2);
} finally {
thread.setContextClassLoader(originalClassLoader);
}
+ try {
+ close();
+ } catch (IOException ioe) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("upgrade.sis.errorCloseFail"), ioe);
+ }
+ }
ready = Boolean.FALSE;
}
- protected final boolean isCloseRequired() {
+ final boolean isCloseRequired() {
return closeRequired;
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java?rev=1658794&r1=1658793&r2=1658794&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/AbstractServletOutputStream.java
Tue Feb 10 20:21:38 2015
@@ -21,6 +21,8 @@ import java.io.IOException;
import javax.servlet.ServletOutputStream;
import javax.servlet.WriteListener;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.net.DispatchType;
import org.apache.tomcat.util.net.SocketWrapper;
@@ -28,6 +30,7 @@ import org.apache.tomcat.util.res.String
public abstract class AbstractServletOutputStream<S> extends
ServletOutputStream {
+ private static final Log log =
LogFactory.getLog(AbstractServletOutputStream.class);
protected static final StringManager sm =
StringManager.getManager(Constants.Package);
@@ -108,7 +111,7 @@ public abstract class AbstractServletOut
}
- protected final boolean isCloseRequired() {
+ final boolean isCloseRequired() {
return closeRequired;
}
@@ -185,7 +188,7 @@ public abstract class AbstractServletOut
}
- protected final void onWritePossible() throws IOException {
+ final void onWritePossible() {
try {
synchronized (writeLock) {
if (bufferLimit > 0) {
@@ -195,11 +198,7 @@ public abstract class AbstractServletOut
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
onError(t);
- if (t instanceof IOException) {
- throw t;
- } else {
- throw new IOException(t);
- }
+ return;
}
// Make sure isReady() and onWritePossible() have a consistent view
@@ -219,6 +218,9 @@ public abstract class AbstractServletOut
try {
thread.setContextClassLoader(applicationLoader);
listener.onWritePossible();
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ onError(t);
} finally {
thread.setContextClassLoader(originalClassLoader);
}
@@ -235,9 +237,19 @@ public abstract class AbstractServletOut
try {
thread.setContextClassLoader(applicationLoader);
listener.onError(t);
+ } catch (Throwable t2) {
+ ExceptionUtils.handleThrowable(t2);
+ log.warn(sm.getString("upgrade.sos.onErrorFail"), t2);
} finally {
thread.setContextClassLoader(originalClassLoader);
}
+ try {
+ close();
+ } catch (IOException ioe) {
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("upgrade.sos.errorCloseFail"), ioe);
+ }
+ }
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties?rev=1658794&r1=1658793&r2=1658794&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/upgrade/LocalStrings.properties
Tue Feb 10 20:21:38 2015
@@ -14,16 +14,18 @@
# limitations under the License.
abstractProcessor.isCloseFail=Failed to close input stream associated with
upgraded connection
-abstractProcessor.onDataAvailableFail=Failed to process data available event
-abstractProcessor.onWritePossibleFail=Failed to process write possible event
abstractProcessor.osCloseFail=Failed to close output stream associated with
upgraded connection
+upgrade.sis.errorCloseFail=Failed to close InputStream cleanly after a
previous error
upgrade.sis.isFinished.ise=It is illegal to call isFinished() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
upgrade.sis.isReady.ise=It is illegal to call isReady() when the
ServletInputStream is not in non-blocking mode (i.e. setReadListener() must be
called first)
+upgrade.sis.onErrorFail=onError processing for the registered ReadListener
triggered this further error which was swallowed
upgrade.sis.readListener.null=It is illegal to pass null to setReadListener()
upgrade.sis.readListener.set=It is illegal to call setReadListener() more than
once for the same upgraded connection
upgrade.sis.read.ise=It is illegal to call any of the read() methods in
non-blocking mode without first checking that there is data available by
calling isReady()
+upgrade.sos.errorCloseFail=Failed to close OutputStream cleanly after a
previous error
upgrade.sos.canWrite.ise=It is illegal to call canWrite() when the
ServletOutputStream is not in non-blocking mode (i.e. setWriteListener() must
be called first)
+upgrade.sos.onErrorFail=onError processing for the registered WriteListener
triggered this further error which was swallowed
upgrade.sos.writeListener.null=It is illegal to pass null to setWriteListener()
upgrade.sos.writeListener.set=It is illegal to call setWriteListener() more
than once for the same upgraded connection
upgrade.sis.write.ise=It is illegal to call any of the write() methods in
non-blocking mode without first checking that there is space available by
calling isReady()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
