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/09/23 11:18:56 UTC
svn commit: r1000373 - in
/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse:
config/ config/xml/ core/axis2/ endpoints/algorithms/ eventing/builders/
mediators/builtin/ mediators/db/ mediators/eip/splitter/ util/
Author: hiranya
Date: Thu Sep 23 09:18:56 2010
New Revision: 1000373
URL: http://svn.apache.org/viewvc?rev=1000373&view=rev
Log:
Refactoring and minor bug fixes
Modified:
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java Thu Sep 23 09:18:56 2010
@@ -429,15 +429,6 @@ public class SynapseConfigUtils {
}
return true;
}
-
- public boolean verify(String hostname, String certHostname) {
- if (log.isTraceEnabled()) {
- log.trace("HostName verification disabled");
- log.trace("Host: " + hostname);
- log.trace("Cert HostName: " + certHostname);
- }
- return true;
- }
});
} else {
if (log.isDebugEnabled()) {
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/AggregateMediatorSerializer.java Thu Sep 23 09:18:56 2010
@@ -39,10 +39,10 @@ public class AggregateMediatorSerializer
mediator = (AggregateMediator) m;
}
+ assert mediator != null;
OMElement aggregator = fac.createOMElement("aggregate", synNS);
saveTracingState(aggregator, mediator);
- assert mediator != null;
if (mediator.getCorrelateExpression() != null) {
OMElement corelateOn = fac.createOMElement("correlateOn", synNS);
SynapseXPathSerializer.serializeXPath(
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceSerializer.java Thu Sep 23 09:18:56 2010
@@ -24,7 +24,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseConstants;
-import org.apache.synapse.aspects.AspectConfigurable;
import org.apache.synapse.aspects.statistics.StatisticsConfigurable;
import org.apache.synapse.config.xml.endpoints.EndpointSerializer;
import org.apache.synapse.core.axis2.ProxyService;
@@ -229,17 +228,13 @@ public class ProxyServiceSerializer {
XMLConfigConstants.TRACE_ATTRIB_NAME, nullNS, traceValue));
}
- if (service instanceof AspectConfigurable) {
- StatisticsConfigurable statisticsConfigurable =
- service.getAspectConfiguration();
-
- if (statisticsConfigurable != null &&
- statisticsConfigurable.isStatisticsEnable()) {
-
- proxy.addAttribute(fac.createOMAttribute(
- XMLConfigConstants.STATISTICS_ATTRIB_NAME, nullNS,
- XMLConfigConstants.STATISTICS_ENABLE));
- }
+ StatisticsConfigurable statisticsConfigurable =
+ service.getAspectConfiguration();
+
+ if (statisticsConfigurable != null && statisticsConfigurable.isStatisticsEnable()) {
+ proxy.addAttribute(fac.createOMAttribute(
+ XMLConfigConstants.STATISTICS_ATTRIB_NAME, nullNS,
+ XMLConfigConstants.STATISTICS_ENABLE));
}
if (parent != null) {
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationSerializer.java Thu Sep 23 09:18:56 2010
@@ -167,22 +167,18 @@ public class SynapseXMLConfigurationSeri
private static void serializeExecutors(OMElement definitions,
Map<String, PriorityExecutor> executors) {
- for (Object o : executors.keySet()) {
- if (o instanceof String) {
- String key = (String) o;
- PriorityExecutor executor = executors.get(key);
- PriorityExecutorSerializer.serialize(definitions, executor,
- XMLConfigConstants.SYNAPSE_NAMESPACE);
- }
- }
+ for (PriorityExecutor exec : executors.values()) {
+ PriorityExecutorSerializer.serialize(definitions, exec,
+ XMLConfigConstants.SYNAPSE_NAMESPACE);
+ }
}
private static void serializeMessageStores(OMElement definitions,
Map<String, MessageStore> messageStores ){
- for (String name : messageStores.keySet()) {
- MessageStoreSerializer.serializeMessageStore(definitions,messageStores.get(name));
- }
+ for (MessageStore ms : messageStores.values()) {
+ MessageStoreSerializer.serializeMessageStore(definitions, ms);
+ }
}
private static void handleException(String msg) {
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java Thu Sep 23 09:18:56 2010
@@ -59,7 +59,7 @@ public class DynamicAxisOperation extend
return new DynamicOperationClient(this, sc, options);
}
- class DynamicOperationClient extends OperationClient {
+ static class DynamicOperationClient extends OperationClient {
DynamicOperationClient(OutInAxisOperation axisOp, ServiceContext sc, Options options) {
super(axisOp, sc, options);
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseStartUpServlet.java Thu Sep 23 09:18:56 2010
@@ -72,8 +72,7 @@ public class SynapseStartUpServlet exten
public void destroy() {
try {
- Object o = (ServerManager) getServletConfig().getServletContext().
- getAttribute(SYNAPSE_SERVER_MANAGER);
+ Object o = getServletConfig().getServletContext().getAttribute(SYNAPSE_SERVER_MANAGER);
if (o != null && o instanceof ServerManager) {
ServerManager serverManager = (ServerManager) o;
serverManager.stop();
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/endpoints/algorithms/WeightedRoundRobin.java Thu Sep 23 09:18:56 2010
@@ -47,6 +47,7 @@ import java.util.Comparator;
* and cycle continues.</p>
*/
public class WeightedRoundRobin implements LoadbalanceAlgorithm, ManagedLifecycle {
+
private static final Log log = LogFactory.getLog(WeightedRoundRobin.class);
/** We keep a sorted array of endpoint states, first state will point to the
@@ -209,10 +210,11 @@ public class WeightedRoundRobin implemen
}
/**
- * This is a thread local implementation of the algorith. This way indivudual threads will
- * do their own weighted round robin without considering the global state of the endpoints
+ * This is a thread local implementation of the algorithm. This way, individual threads will
+ * do their own weighted round robin without considering the global state of the endpoints.
*/
- private class Algorithm {
+ private static class Algorithm {
+
/**
* We keep a sorted array of endpoint states, first state will point to the
* endpoint with the highest weight
@@ -260,7 +262,7 @@ public class WeightedRoundRobin implemen
/**
* Simple class for holding the states about the endpoints.
*/
- private class EndpointState {
+ private static class EndpointState {
/** Position of the endpoint, represented by this state */
private int endpointPosition = 0;
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/ResponseMessageBuilder.java Thu Sep 23 09:18:56 2010
@@ -300,11 +300,6 @@ public class ResponseMessageBuilder {
}
}
- private void handleException(String message) {
- log.error(message);
- throw new SynapseException(message);
- }
-
private void handleException(String message, Exception e) {
log.error(message, e);
throw new SynapseException(message, e);
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/eventing/builders/SubscriptionMessageBuilder.java Thu Sep 23 09:18:56 2010
@@ -27,9 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
import org.apache.synapse.config.xml.XMLConfigConstants;
-import org.apache.synapse.endpoints.AddressEndpoint;
-import org.apache.synapse.endpoints.Endpoint;
-import org.apache.synapse.endpoints.EndpointDefinition;
import org.apache.synapse.eventing.SynapseSubscription;
import org.wso2.eventing.EventingConstants;
@@ -114,12 +111,12 @@ public class SubscriptionMessageBuilder
* (47) </s12:Body>
* (48) </s12:Envelope>
*
- * @param mc
- * @return
+ * @param mc The MessageContext from which to create the SynapseSubscription
+ * @return The SynapseSubscription
*/
public static SynapseSubscription createSubscription(MessageContext mc) {
SynapseSubscription subscription = null;
- OMElement notifyToElem = null;
+ OMElement notifyToElem;
OMElement elem = mc.getEnvelope().getBody().getFirstChildWithName(SUBSCRIBE_QNAME);
if (elem != null) {
OMElement deliveryElem = elem.getFirstChildWithName(DELIVERY_QNAME);
@@ -208,8 +205,8 @@ public class SubscriptionMessageBuilder
* (25) </s12:Body>
* (26) </s12:Envelope>
*
- * @param mc
- * @return
+ * @param mc The MessageContext from which to create the SynapseSubscription
+ * @return The SynapseSubscription
*/
public static SynapseSubscription createUnSubscribeMessage(MessageContext mc) {
SynapseSubscription subscription = new SynapseSubscription();
@@ -250,8 +247,8 @@ public class SubscriptionMessageBuilder
* (27) </s12:Body>
* (28) </s12:Envelope>
*
- * @param mc
- * @return
+ * @param mc MessageContext from which to create the SynapseSubscription
+ * @return The SynapseSubscription
*/
public static SynapseSubscription createRenewSubscribeMessage(MessageContext mc) {
SynapseSubscription subscription = new SynapseSubscription();
@@ -322,8 +319,8 @@ public class SubscriptionMessageBuilder
* (25) </s12:Body>
* (26) </s12:Envelope>
*
- * @param mc
- * @return
+ * @param mc The MessageContext from which to extract the SynapseSubscription
+ * @return The SynapseSubscription
*/
public static SynapseSubscription createGetStatusMessage(MessageContext mc) {
SynapseSubscription subscription = new SynapseSubscription();
@@ -334,24 +331,11 @@ public class SubscriptionMessageBuilder
return subscription;
}
- private static Endpoint getEndpointFromWSAAddress(OMElement address) {
- AddressEndpoint endpoint = new AddressEndpoint();
- EndpointDefinition def = new EndpointDefinition();
- def.setAddress(address.getText().trim());
- endpoint.setDefinition(def);
- return endpoint;
- }
-
private static void handleException(String message) {
log.error(message);
throw new SynapseException(message);
}
- private static void handleException(String message, Exception e) {
- log.error(message, e);
- throw new SynapseException(message, e);
- }
-
public static String getErrorSubCode() {
return errorSubCode;
}
@@ -384,11 +368,12 @@ public class SubscriptionMessageBuilder
}
/**
- * Check is a valid date, this check required due to Java calendar use the Julion date to create
- * dates, so feb-31 take as a valid date and converts to march-03, ConverterUtil wont validate.
+ * Check is a valid date, this check required due to Java calendar use the Julion
+ * date to create dates, so feb-31 is taken as a valid date and converts to march-03,
+ * ConverterUtil wont validate.
*
- * @param original
- * @param converted
+ * @param original The original date as a string
+ * @param converted The Calendar instance to be validated
* @return true || false
*/
private static boolean isValidDate(String original, Calendar converted) {
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/CalloutMediator.java Thu Sep 23 09:18:56 2010
@@ -230,7 +230,10 @@ public class CalloutMediator extends Abs
public void destroy() {
try {
sc.cleanup();
- } catch (AxisFault ignore) {}
+ } catch (AxisFault af) {
+ log.warn("Error while cleaning up the service client instance used by the " +
+ "Callout mediator", af);
+ }
}
public String getServiceURL() {
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/builtin/ValidateMediator.java Thu Sep 23 09:18:56 2010
@@ -115,7 +115,7 @@ public class ValidateMediator extends Ab
}
// This is the reference to the DefaultHandler instance
- MyErrorHandler errorHandler = new MyErrorHandler();
+ ValidateMediatorErrorHandler errorHandler = new ValidateMediatorErrorHandler();
// do not re-initialize schema unless required
synchronized (validatorLock) {
@@ -221,7 +221,7 @@ public class ValidateMediator extends Ab
/**
* This class handles validation errors to be used for the error reporting
*/
- private class MyErrorHandler extends DefaultHandler {
+ private static class ValidateMediatorErrorHandler extends DefaultHandler {
private boolean validationError = false;
private SAXParseException saxParseException = null;
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/DBLookupMediator.java Thu Sep 23 09:18:56 2010
@@ -39,10 +39,11 @@ public class DBLookupMediator extends Ab
// execute the prepared statement, and extract the first result row and
// set as message context properties, any results that have been specified
Connection con = null;
+ ResultSet rs = null;
try {
PreparedStatement ps = getPreparedStatement(stmnt, msgCtx);
con = ps.getConnection();
- ResultSet rs = ps.executeQuery();
+ rs = ps.executeQuery();
if (rs.next()) {
if (synLog.isTraceOrDebugEnabled()) {
@@ -86,6 +87,11 @@ public class DBLookupMediator extends Ab
handleException("Error executing statement : " + stmnt.getRawStatement() +
" against DataSource : " + getDSName(), e, msgCtx);
} finally {
+ if (rs != null) {
+ try {
+ rs.close();
+ } catch (SQLException e) {}
+ }
if (con != null) {
try {
con.close();
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/db/Statement.java Thu Sep 23 09:18:56 2010
@@ -62,7 +62,7 @@ public class Statement {
return resultsMap;
}
- public class Parameter {
+ public static class Parameter {
String propertyName = null;
SynapseXPath xpath = null;
int type = 0;
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/CloneMediator.java Thu Sep 23 09:18:56 2010
@@ -161,9 +161,7 @@ public class CloneMediator extends Abstr
seq.init(se);
}
Endpoint endpoint = target.getEndpoint();
- if (endpoint instanceof ManagedLifecycle) {
- ((ManagedLifecycle) endpoint).init(se);
- }
+ endpoint.init(se);
}
}
@@ -175,9 +173,7 @@ public class CloneMediator extends Abstr
seq.destroy();
}
Endpoint endpoint = target.getEndpoint();
- if (endpoint instanceof ManagedLifecycle) {
- ((ManagedLifecycle) endpoint).destroy();
- }
+ endpoint.destroy();
}
}
}
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/mediators/eip/splitter/IterateMediator.java Thu Sep 23 09:18:56 2010
@@ -256,9 +256,8 @@ public class IterateMediator extends Abs
public void init(SynapseEnvironment se) {
if (target != null) {
Endpoint endpoint = target.getEndpoint();
- if (endpoint instanceof ManagedLifecycle) {
- ((ManagedLifecycle) endpoint).init(se);
- }
+ endpoint.init(se);
+
ManagedLifecycle seq = target.getSequence();
if (seq != null) {
seq.init(se);
@@ -269,9 +268,8 @@ public class IterateMediator extends Abs
public void destroy() {
if (target != null) {
Endpoint endpoint = target.getEndpoint();
- if (endpoint instanceof ManagedLifecycle) {
- ((ManagedLifecycle) endpoint).destroy();
- }
+ endpoint.destroy();
+
ManagedLifecycle seq = target.getSequence();
if (seq != null) {
seq.destroy();
Modified: synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java
URL: http://svn.apache.org/viewvc/synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java?rev=1000373&r1=1000372&r2=1000373&view=diff
==============================================================================
--- synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java (original)
+++ synapse/branches/2.0/modules/core/src/main/java/org/apache/synapse/util/UUIDGenerator.java Thu Sep 23 09:18:56 2010
@@ -90,7 +90,7 @@ public class UUIDGenerator {
md5 = MessageDigest.getInstance("MD5");
} catch (NoSuchAlgorithmException e) {
//System.out.println("Error: " + e);
- //todo heve to be properly handle
+ //todo have to be properly handled
}
md5.update(sb.toString().getBytes());
byte[] array = md5.digest();