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/25 08:45:31 UTC
svn commit: r927293 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/xml/endpoints/LoadbalanceEndpointSerializer.java
endpoints/LoadbalanceEndpoint.java
Author: hiranya
Date: Thu Mar 25 07:45:30 2010
New Revision: 927293
URL: http://svn.apache.org/viewvc?rev=927293&view=rev
Log:
Fixing a bug in the lb endpoint serializer and the load balance endpoint (Required for sample 58)
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java?rev=927293&r1=927292&r2=927293&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/endpoints/LoadbalanceEndpointSerializer.java Thu Mar 25 07:45:30 2010
@@ -67,23 +67,24 @@ public class LoadbalanceEndpointSerializ
}
// Serialize endpoint elements which are children of the loadbalance element
- for (Endpoint childEndpoint : loadbalanceEndpoint.getChildren()) {
- loadbalanceElement.addChild(EndpointSerializer.getElementFromEndpoint(childEndpoint));
- }
-
-// TODO FIX_RUWAN
-// // Serialize member elements which are children of the loadbalance element
-// for (Member member : loadbalanceEndpoint.getAllMembers()) {
-// OMElement memberEle =
-// fac.createOMElement("member",
-// SynapseConstants.SYNAPSE_OMNAMESPACE, loadbalanceElement);
-// memberEle.addAttribute(fac.createOMAttribute("hostName", null, member.getHostName()));
-// memberEle.addAttribute(fac.createOMAttribute("httpPort", null,
-// String.valueOf(member.getHttpPort())));
-// memberEle.addAttribute(fac.createOMAttribute("httpsPort", null,
-// String.valueOf(member.getHttpsPort())));
-// }
+ if (loadbalanceEndpoint.getChildren() != null) {
+ for (Endpoint childEndpoint : loadbalanceEndpoint.getChildren()) {
+ loadbalanceElement.addChild(EndpointSerializer.getElementFromEndpoint(childEndpoint));
+ }
+ } else {
+ for (Member member : loadbalanceEndpoint.getMembers()) {
+ OMElement memberEle = fac.createOMElement(
+ "member", SynapseConstants.SYNAPSE_OMNAMESPACE, loadbalanceElement);
+ memberEle.addAttribute(fac.createOMAttribute(
+ "hostName", null, member.getHostName()));
+ memberEle.addAttribute(fac.createOMAttribute(
+ "httpPort", null, String.valueOf(member.getHttpPort())));
+ memberEle.addAttribute(fac.createOMAttribute(
+ "httpsPort", null, String.valueOf(member.getHttpsPort())));
+ loadbalanceElement.addChild(memberEle);
+ }
+ }
return endpointElement;
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java?rev=927293&r1=927292&r2=927293&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/LoadbalanceEndpoint.java Thu Mar 25 07:45:30 2010
@@ -160,6 +160,7 @@ public class LoadbalanceEndpoint extends
AddressEndpoint endpoint = new AddressEndpoint();
EndpointDefinition definition = new EndpointDefinition();
endpoint.setDefinition(definition);
+ endpoint.init(synCtx.getEnvironment());
endpoint.send(synCtx);
} else {
log.error("Cannot load balance for non-HTTP/S transport " + transport);