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

[veithen]

Author: veithen
Date: Sat May 15 18:58:53 2010
New Revision: 944697

URL: http://svn.apache.org/viewvc?rev=944697&view=rev
Log:
Update messagesSent metric only after all data has been sent successfully, as 
in the other transports.

Modified:
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
    
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.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=944697&r1=944696&r2=944697&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
 Sat May 15 18:58:53 2010
@@ -561,6 +561,14 @@ public class ClientHandler implements NH
                 } else {
                     metrics.incrementBytesSent(bytesWritten);
                 }
+                
+                if (encoder.isCompleted()) {
+                    if (metrics.getLevel() == MetricsCollector.LEVEL_FULL) {
+                        metrics.incrementMessagesSent(getMessageContext(conn));
+                    } else {
+                        metrics.incrementMessagesSent();
+                    }
+                }
 
                 ClientConnectionDebug ccd = (ClientConnectionDebug)
                         context.getAttribute(CLIENT_CONNECTION_DEBUG);

Modified: 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=944697&r1=944696&r2=944697&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
 (original)
+++ 
synapse/trunk/java/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
 Sat May 15 18:58:53 2010
@@ -436,14 +436,6 @@ public class HttpCoreNIOSender extends A
 
             try {
                 axis2Req.streamMessageContents();
-                if (metrics != null) {
-                    if (metrics.getLevel() == MetricsCollector.LEVEL_FULL) {
-                        metrics.incrementMessagesSent(msgContext);
-                    } else {
-                        metrics.incrementMessagesSent();
-                    }
-                }
-
             } catch (AxisFault af) {
                 throw af;
             }