You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by hi...@apache.org on 2010/03/08 10:22:11 UTC

svn commit: r920242 - /synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java

Author: hiranya
Date: Mon Mar  8 09:22:10 2010
New Revision: 920242

URL: http://svn.apache.org/viewvc?rev=920242&view=rev
Log:
Fixing some potential NPEs


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

Modified: synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=920242&r1=920241&r2=920242&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java (original)
+++ synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java Mon Mar  8 09:22:10 2010
@@ -487,8 +487,11 @@
             }
 
             if (decoder.isCompleted()) {
-                ((ClientConnectionDebug) conn.getContext().getAttribute(CLIENT_CONNECTION_DEBUG)).
-                    recordResponseCompletionTime();
+                ClientConnectionDebug ccd = (ClientConnectionDebug)
+                        conn.getContext().getAttribute(CLIENT_CONNECTION_DEBUG);
+                if (ccd != null) {
+                    ccd.recordResponseCompletionTime();
+                }
                 
                 if (metrics != null) {
                     if (metrics.getLevel() == MetricsCollector.LEVEL_FULL) {
@@ -558,8 +561,12 @@
                 } else {
                     metrics.incrementBytesSent(bytesWritten);
                 }
-                ((ClientConnectionDebug) context.getAttribute(
-                        CLIENT_CONNECTION_DEBUG)).recordRequestCompletionTime();
+
+                ClientConnectionDebug ccd = (ClientConnectionDebug)
+                        context.getAttribute(CLIENT_CONNECTION_DEBUG);
+                if (ccd != null) {
+                    ccd.recordRequestCompletionTime();
+                }
             }
 
         } catch (IOException e) {
@@ -595,8 +602,11 @@
             return;
         }
 
-        ((ClientConnectionDebug) conn.getContext().getAttribute(CLIENT_CONNECTION_DEBUG)).
-                recordResponseStartTime(response.getStatusLine().toString());
+        ClientConnectionDebug ccd = (ClientConnectionDebug) 
+                conn.getContext().getAttribute(CLIENT_CONNECTION_DEBUG);
+        if (ccd != null) {
+            ccd.recordResponseStartTime(response.getStatusLine().toString());
+        }
 
         // Have we sent out our request fully in the first place? if not, forget about it now..
         Axis2HttpRequest req