Author: azeez
Date: Tue Jun 12 06:18:34 2007
New Revision: 546475
URL: http://svn.apache.org/viewvc?view=rev&rev=546475
Log:
Some minor updates
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java?view=diff&rev=546475&r1=546474&r2=546475
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
Tue Jun 12 06:18:34 2007
@@ -22,6 +22,7 @@
import org.apache.axis2.clustering.context.ContextManager;
import org.apache.axis2.context.*;
import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.commons.logging.Log;
@@ -51,14 +52,19 @@
public void flowComplete(MessageContext msgContext) {
// If there are no members, we need not do any replication
- /*ClusterManager clusterManager =
+ ClusterManager clusterManager =
msgContext.getConfigurationContext().getAxisConfiguration().getClusterManager();
if(clusterManager != null && clusterManager.getMemberCount() == 0){
return;
- }*/
+ }
+ AxisOperation axisOperation = msgContext.getAxisOperation();
+ if(axisOperation == null){
+ return;
+ }
+
+ String mep = axisOperation.getMessageExchangePattern();
int flow = msgContext.getFLOW();
- String mep = msgContext.getAxisOperation().getMessageExchangePattern();
// The ReplicationHandler should be added to all 4 flows. We will
replicate on flowComplete
// only during one of the flows
@@ -83,6 +89,7 @@
} catch (Exception e) {
String message = "Could not replicate the state";
log.error(message, e);
+ //TODO: We need to throw a checked exception
}
}
}
@@ -137,8 +144,8 @@
Thread.sleep(50);
} catch (InterruptedException ignored) {
}
- if (System.currentTimeMillis() - start > 20000) {
- throw new ClusteringFault("ACKs not received from all
members within 20 sec. " +
+ if (System.currentTimeMillis() - start > 40000) {
+ throw new ClusteringFault("ACKs not received from all
members within 40 sec. " +
"Aborting wait.");
}
} while (!contextManager.isMessageAcknowledged(msgUUID));
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java?view=diff&rev=546475&r1=546474&r2=546475
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelListener.java
Tue Jun 12 06:18:34 2007
@@ -17,7 +17,6 @@
package org.apache.axis2.clustering.tribes;
import org.apache.axis2.clustering.ClusteringConstants;
-import org.apache.axis2.clustering.ClusteringFault;
import
org.apache.axis2.clustering.configuration.ConfigurationClusteringCommand;
import org.apache.axis2.clustering.configuration.DefaultConfigurationManager;
import org.apache.axis2.clustering.context.ContextClusteringCommand;
Modified:
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java?view=diff&rev=546475&r1=546474&r2=546475
==============================================================================
---
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
(original)
+++
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
Tue Jun 12 06:18:34 2007
@@ -38,7 +38,7 @@
while (true) {
if (channel.getMembers().length > 0) {
try {
- channel.send(channel.getMembers(), msg, 0); // TODO: We
must try to minimize the delay here
+ channel.send(channel.getMembers(), msg, 0);
log.debug("Sent " + msg + " to group");
break;
} catch (ChannelException e) {
@@ -90,9 +90,6 @@
public void sendToMember(ClusteringCommand cmd, Member member) throws
ClusteringFault {
try {
- System.err.println("######## MEM Ready=" + member.isReady());
- System.err.println("######## MEM Failing=" + member.isFailing());
- System.err.println("######## MEM Suspect=" + member.isSuspect());
if (member.isReady()) {
channel.send(new Member[]{member}, cmd, 0);
log.debug("Sent " + cmd + " to " + member.getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
