svn commit: r823049 - in /synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp: ConnectionPool.java ServerHandler.java

[ruwan]

Author: ruwan
Date: Thu Oct  8 06:03:22 2009
New Revision: 823049

URL: http://svn.apache.org/viewvc?rev=823049&view=rev
Log:
Fixing the build issue on trunk

Modified:
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java?rev=823049&r1=823048&r2=823049&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ConnectionPool.java
 Thu Oct  8 06:03:22 2009
@@ -120,7 +120,6 @@
 
         ctx.removeAttribute(ExecutionContext.HTTP_REQUEST);
         ctx.removeAttribute(ExecutionContext.HTTP_RESPONSE);
-        ctx.removeAttribute(ExecutionContext.HTTP_CONNECTION);
 
         conn.resetOutput();
     }

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java?rev=823049&r1=823048&r2=823049&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
 Thu Oct  8 06:03:22 2009
@@ -359,14 +359,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 " +
@@ -377,6 +377,11 @@
             if (metrics != null) {
                 metrics.incrementFaultsReceiving();
             }
+        } else {
+            log.error("Unexpected I/O error: " + e.getClass().getName(), e);
+            if (metrics != null) {
+                metrics.incrementFaultsReceiving();
+            }
         }
         shutdownConnection(conn);
     }