Author: ruwan
Date: Tue Aug 17 07:21:11 2010
New Revision: 986213
URL: http://svn.apache.org/viewvc?rev=986213&view=rev
Log:
minor refromatting and a perf fix
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Condition.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java?rev=986213&r1=986212&r2=986213&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/AndEvaluator.java
Tue Aug 17 07:21:11 2010
@@ -31,6 +31,7 @@ package org.apache.synapse.commons.evalu
* </pre>
*/
public class AndEvaluator implements Evaluator {
+
private Evaluator[] evaluators;
public boolean evaluate(EvaluatorContext context) throws
EvaluatorException {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Condition.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Condition.java?rev=986213&r1=986212&r2=986213&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Condition.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/Condition.java
Tue Aug 17 07:21:11 2010
@@ -23,6 +23,7 @@ package org.apache.synapse.commons.evalu
* Encapsulates a condition. Every condition has a priority and a boolean
expression.
*/
public class Condition {
+
private int priority = 0;
private Evaluator evaluator = null;
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java?rev=986213&r1=986212&r2=986213&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/OrEvaluator.java
Tue Aug 17 07:21:11 2010
@@ -31,6 +31,7 @@ package org.apache.synapse.commons.evalu
* </pre>
*/
public class OrEvaluator implements Evaluator {
+
private Evaluator[] evaluators;
public boolean evaluate(EvaluatorContext context) throws
EvaluatorException {
Modified:
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java?rev=986213&r1=986212&r2=986213&view=diff
==============================================================================
---
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
(original)
+++
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/evaluators/config/AbstractEvaluatorSerializer.java
Tue Aug 17 07:21:11 2010
@@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFac
* Provide common methods for {...@link EvaluatorSerializer} implementations
*/
public abstract class AbstractEvaluatorSerializer implements
EvaluatorSerializer {
+
protected static Log log;
protected static final OMFactory fac = OMAbstractFactory.getOMFactory();
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java?rev=986213&r1=986212&r2=986213&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/EndpointView.java
Tue Aug 17 07:21:11 2010
@@ -19,13 +19,13 @@
package org.apache.synapse.endpoints;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
import org.apache.axis2.transport.base.MessageLevelMetricsCollector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
/**
* This class is the metrics collector and JMX control point for Endpoints
@@ -672,11 +672,11 @@ public class EndpointView implements End
//---------- utility methods ---------------
private static void addTableMaps(Map<Integer, Long> t, Map<Integer, Long>
s) {
- for (Integer o : s.keySet()) {
- if (t.containsKey(o)) {
- t.put(o, t.get(o) + s.get(o));
+ for (Map.Entry<Integer, Long> o : s.entrySet()) {
+ if (t.containsKey(o.getKey())) {
+ t.put(o.getKey(), o.getValue() + s.get(o.getKey()));
} else {
- t.put(o, s.get(o));
+ t.put(o.getKey(), s.get(o.getKey()));
}
}
}
