You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2010/03/24 10:19:05 UTC
svn commit: r926984 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2:
Axis2Sender.java Axis2SynapseEnvironment.java
Author: indika
Date: Wed Mar 24 09:19:05 2010
New Revision: 926984
URL: http://svn.apache.org/viewvc?rev=926984&view=rev
Log:
fix an issue with stats report when there is no out sequence in the proxy
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java?rev=926984&r1=926983&r2=926984&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java Wed Mar 24 09:19:05 2010
@@ -31,6 +31,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.aspects.statistics.StatisticsReporter;
import org.apache.synapse.endpoints.EndpointDefinition;
import org.apache.synapse.transport.nhttp.NhttpConstants;
import org.apache.synapse.util.MessageHelper;
@@ -59,6 +60,11 @@ public class Axis2Sender {
// The Axis2 Message context of the Synapse MC
synapseInMessageContext);
+ if (synapseInMessageContext.isResponse()) {
+ // report stats for any component at response sending check point
+ StatisticsReporter.reportForAllOnResponseSent(synapseInMessageContext, endpoint);
+ }
+
} catch (Exception e) {
handleException("Unexpected error during sending message out", e);
}
@@ -98,11 +104,11 @@ public class Axis2Sender {
messageContext.setWSAAction("");
messageContext.setSoapAction("");
messageContext.setProperty(
- NhttpConstants.IGNORE_SC_ACCEPTED, Constants.VALUE_TRUE);
+ NhttpConstants.IGNORE_SC_ACCEPTED, Constants.VALUE_TRUE);
messageContext.setProperty(
AddressingConstants.DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
}
-
+
if (messageContext.getEnvelope().hasFault()
&& AddressingHelper.isFaultRedirected(messageContext)
&& !messageContext.getFaultTo().hasNoneAddress()) {
@@ -134,7 +140,10 @@ public class Axis2Sender {
}
Axis2FlexibleMEPClient.clearSecurtityProperties(messageContext.getOptions());
-
+
+ // report stats for any component at response sending check point
+ StatisticsReporter.reportForAllOnResponseSent(smc, null);
+
AxisEngine.send(messageContext);
} catch (AxisFault e) {
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java?rev=926984&r1=926983&r2=926984&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2SynapseEnvironment.java Wed Mar 24 09:19:05 2010
@@ -31,7 +31,6 @@ import org.apache.synapse.MessageContext
import org.apache.synapse.SynapseConstants;
import org.apache.synapse.SynapseException;
import org.apache.synapse.aspects.statistics.StatisticsCollector;
-import org.apache.synapse.aspects.statistics.StatisticsReporter;
import org.apache.synapse.commons.util.TemporaryData;
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
@@ -60,12 +59,12 @@ public class Axis2SynapseEnvironment imp
private StatisticsCollector statisticsCollector;
public Axis2SynapseEnvironment(SynapseConfiguration synCfg) {
-
+
int coreThreads = SynapseThreadPool.SYNAPSE_CORE_THREADS;
int maxThreads = SynapseThreadPool.SYNAPSE_MAX_THREADS;
long keepAlive = SynapseThreadPool.SYNAPSE_KEEP_ALIVE;
int qlength = SynapseThreadPool.SYNAPSE_THREAD_QLEN;
-
+
try {
qlength = Integer.parseInt(synCfg.getProperty(SynapseThreadPool.SYN_THREAD_QLEN));
} catch (Exception ignore) {}
@@ -81,7 +80,7 @@ public class Axis2SynapseEnvironment imp
try {
keepAlive = Long.parseLong(synCfg.getProperty(SynapseThreadPool.SYN_THREAD_ALIVE));
} catch (Exception ignore) {}
-
+
this.executorService = new SynapseThreadPool(coreThreads, maxThreads, keepAlive, qlength,
synCfg.getProperty(SynapseThreadPool.SYN_THREAD_GROUP,
SynapseThreadPool.SYNAPSE_THREAD_GROUP),
@@ -100,7 +99,7 @@ public class Axis2SynapseEnvironment imp
if (log.isDebugEnabled()) {
log.debug("Injecting MessageContext");
}
- synCtx.setEnvironment(this);
+ synCtx.setEnvironment(this);
Mediator mandatorySeq = synCtx.getConfiguration().getMandatorySequence();
// the mandatory sequence is optional and hence check for the existance before mediation
if (mandatorySeq != null) {
@@ -174,7 +173,6 @@ public class Axis2SynapseEnvironment imp
} else {
Axis2Sender.sendBack(synCtx);
}
- StatisticsReporter.reportForAllOnResponseSent(synCtx, endpoint);
} else {
// If this request is related to session affinity endpoints - For client initiated session
Dispatcher dispatcher =