You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2009/10/05 05:05:45 UTC
svn commit: r821670 - in
/synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp:
ConnectionPool.java ServerHandler.java
Author: asankha
Date: Mon Oct 5 03:05:44 2009
New Revision: 821670
URL: http://svn.apache.org/viewvc?rev=821670&view=rev
Log:
transport stability improvements and correct behavior with httpcore 4.1-alpha1
Modified:
synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java
synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
Modified: synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java
URL: http://svn.apache.org/viewvc/synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java?rev=821670&r1=821669&r2=821670&view=diff
==============================================================================
--- synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java (original)
+++ synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java Mon Oct 5 03:05:44 2009
@@ -120,7 +120,6 @@
ctx.removeAttribute(ExecutionContext.HTTP_REQUEST);
ctx.removeAttribute(ExecutionContext.HTTP_RESPONSE);
- ctx.removeAttribute(ExecutionContext.HTTP_CONNECTION);
conn.resetOutput();
}
Modified: synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
URL: http://svn.apache.org/viewvc/synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java?rev=821670&r1=821669&r2=821670&view=diff
==============================================================================
--- synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java (original)
+++ synapse/branches/1.3/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java Mon Oct 5 03:05:44 2009
@@ -364,14 +364,14 @@
* @param e the exception encountered
*/
public void exception(NHttpServerConnection conn, IOException e) {
- if (e instanceof ConnectionClosedException ||
+ if (e instanceof ConnectionClosedException || (e.getMessage() != null &&
e.getMessage().contains("Connection reset by peer") ||
- e.getMessage().contains("forcibly closed")) {
+ e.getMessage().contains("forcibly closed"))) {
if (log.isDebugEnabled()) {
log.debug("I/O error (Probably the keepalive connection " +
"was closed):" + e.getMessage());
}
- } else {
+ } else if (e.getMessage() != null) {
String msg = e.getMessage().toLowerCase();
if (msg.indexOf("broken") != -1) {
log.warn("I/O error (Probably the connection " +
@@ -382,6 +382,11 @@
if (metrics != null) {
metrics.incrementFaultsReceiving();
}
+ } else {
+ log.error("Unexpected I/O error: " + e.getClass().getName(), e);
+ if (metrics != null) {
+ metrics.incrementFaultsReceiving();
+ }
}
shutdownConnection(conn);
}