Author: markt
Date: Wed Dec 24 10:22:36 2008
New Revision: 729351
URL: http://svn.apache.org/viewvc?rev=729351&view=rev
Log:
Remaining generics for o.a.c.tribes
Change the Comparator in Membership to align with AbsoluteOrder
Fix various Eclipse warnings (unused code etc)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
tomcat/trunk/java/org/apache/catalina/tribes/ManagedChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelException.java Wed Dec
24 10:22:36 2008
@@ -38,7 +38,7 @@
/*
* Holds a list of faulty members
*/
- private ArrayList faultyMembers=null;
+ private ArrayList<FaultyMember> faultyMembers=null;
/**
* Constructor, creates a ChannelException
@@ -87,7 +87,7 @@
} else {
buf.append("; Faulty members:");
for ( int i=0; i<faultyMembers.size(); i++ ) {
- FaultyMember mbr = (FaultyMember)faultyMembers.get(i);
+ FaultyMember mbr = faultyMembers.get(i);
buf.append(mbr.getMember().getName());
buf.append("; ");
}
@@ -121,7 +121,7 @@
* @param mbr FaultyMember
*/
public boolean addFaultyMember(FaultyMember mbr) {
- if ( this.faultyMembers==null ) this.faultyMembers = new ArrayList();
+ if ( this.faultyMembers==null ) this.faultyMembers = new
ArrayList<FaultyMember>();
if ( !faultyMembers.contains(mbr) ) return faultyMembers.add(mbr);
else return false;
}
@@ -132,7 +132,7 @@
*/
public FaultyMember[] getFaultyMembers() {
if ( this.faultyMembers==null ) return EMPTY_LIST;
- return (FaultyMember[])faultyMembers.toArray(new
FaultyMember[faultyMembers.size()]);
+ return faultyMembers.toArray(new FaultyMember[faultyMembers.size()]);
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/tribes/ManagedChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ManagedChannel.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ManagedChannel.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ManagedChannel.java Wed Dec 24
10:22:36 2008
@@ -74,5 +74,5 @@
* @return Iterator
* @see Channel#addInterceptor(ChannelInterceptor)
*/
- public Iterator getInterceptors();
+ public Iterator<ChannelInterceptor> getInterceptors();
}
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java Wed
Dec 24 10:22:36 2008
@@ -57,13 +57,8 @@
}
- public static class AbsoluteComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- if ( !((o1 instanceof Member) && (o2 instanceof Member)) ) return
0;
- return compareMembers((Member)o1,(Member)o2);
- }
-
- public int compareMembers(Member m1, Member m2) {
+ public static class AbsoluteComparator implements Comparator<Member> {
+ public int compare(Member m1, Member m2) {
int result = compareIps(m1,m2);
if ( result == 0 ) result = comparePorts(m1,m2);
if ( result == 0 ) result = compareIds(m1,m2);
@@ -97,7 +92,7 @@
}
protected int compareBytes(byte b1, byte b2) {
- return compareInts((int)b1,(int)b2);
+ return compareInts(b1,b2);
}
protected int compareInts(int b1, int b2) {
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java Wed
Dec 24 10:22:36 2008
@@ -88,12 +88,12 @@
/**
* A list of membership listeners that subscribe to membership
announcements
*/
- protected ArrayList membershipListeners = new ArrayList();
+ protected ArrayList<Object> membershipListeners = new ArrayList<Object>();
/**
* A list of channel listeners that subscribe to incoming messages
*/
- protected ArrayList channelListeners = new ArrayList();
+ protected ArrayList<Object> channelListeners = new ArrayList<Object>();
/**
* If set to true, the GroupChannel will check to make sure that
@@ -147,7 +147,7 @@
*/
public void heartbeat() {
super.heartbeat();
- Iterator i = membershipListeners.iterator();
+ Iterator<Object> i = membershipListeners.iterator();
while ( i.hasNext() ) {
Object o = i.next();
if ( o instanceof Heartbeat ) ((Heartbeat)o).heartbeat();
@@ -344,7 +344,7 @@
if ( getFirstInterceptor() != null &&
((getFirstInterceptor().getNext() instanceof
ChannelCoordinator))) {
ChannelInterceptor interceptor = null;
- Class clazz = null;
+ Class<?> clazz = null;
try {
clazz =
Class.forName("org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor",
true,GroupChannel.class.getClassLoader());
@@ -529,7 +529,7 @@
* Returns an iterator of all the interceptors in this stack
* @return Iterator
*/
- public Iterator getInterceptors() {
+ public Iterator<ChannelInterceptor> getInterceptors() {
return new InterceptorIterator(this.getNext(),this.coordinator);
}
@@ -596,7 +596,7 @@
*
* @version 1.0
*/
- public static class InterceptorIterator implements Iterator {
+ public static class InterceptorIterator implements
Iterator<ChannelInterceptor> {
private ChannelInterceptor end;
private ChannelInterceptor start;
public InterceptorIterator(ChannelInterceptor start,
ChannelInterceptor end) {
@@ -608,8 +608,8 @@
return start!=null && start != end;
}
- public Object next() {
- Object result = null;
+ public ChannelInterceptor next() {
+ ChannelInterceptor result = null;
if ( hasNext() ) {
result = start;
start = start.getNext();
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Wed Dec
24 10:22:36 2008
@@ -43,7 +43,7 @@
private RpcCallback callback;
private byte[] rpcId;
- private HashMap responseMap = new HashMap();
+ private HashMap<RpcCollectorKey, RpcCollector> responseMap = new
HashMap<RpcCollectorKey, RpcCollector>();
/**
* Create an RPC channel. You can have several RPC channels attached to a
group
@@ -90,7 +90,7 @@
if ( rpcOptions != NO_REPLY ) collector.wait(timeout);
}
} catch ( InterruptedException ix ) {
- Thread.currentThread().interrupted();
+ Thread.interrupted();
//throw new ChannelException(ix);
}finally {
responseMap.remove(key);
@@ -102,7 +102,7 @@
RpcMessage rmsg = (RpcMessage)msg;
RpcCollectorKey key = new RpcCollectorKey(rmsg.uuid);
if ( rmsg.reply ) {
- RpcCollector collector = (RpcCollector)responseMap.get(key);
+ RpcCollector collector = responseMap.get(key);
if (collector == null) {
callback.leftOver(rmsg.message, sender);
} else {
@@ -180,7 +180,7 @@
* @version 1.0
*/
public static class RpcCollector {
- public ArrayList responses = new ArrayList();
+ public ArrayList<Response> responses = new ArrayList<Response>();
public RpcCollectorKey key;
public int options;
public int destcnt;
@@ -227,7 +227,7 @@
}
public Response[] getResponses() {
- return (Response[])responses.toArray(new
Response[responses.size()]);
+ return responses.toArray(new Response[responses.size()]);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
Wed Dec 24 10:22:36 2008
@@ -33,8 +33,6 @@
*/
public class DomainFilterInterceptor extends ChannelInterceptorBase {
- private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( DomainFilterInterceptor.class );
-
protected Membership membership = null;
protected byte[] domain = new byte[0];
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/FragmentationInterceptor.java
Wed Dec 24 10:22:36 2008
@@ -43,7 +43,7 @@
public class FragmentationInterceptor extends ChannelInterceptorBase {
private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog( FragmentationInterceptor.class );
- protected HashMap fragpieces = new HashMap();
+ protected HashMap<FragKey, FragCollection> fragpieces = new
HashMap<FragKey, FragCollection>();
private int maxSize = 1024*100;
private long expire = 1000 * 60; //one minute expiration
protected boolean deepclone = true;
@@ -72,10 +72,10 @@
public FragCollection getFragCollection(FragKey key, ChannelMessage msg) {
- FragCollection coll = (FragCollection)fragpieces.get(key);
+ FragCollection coll = fragpieces.get(key);
if ( coll == null ) {
synchronized (fragpieces) {
- coll = (FragCollection)fragpieces.get(key);
+ coll = fragpieces.get(key);
if ( coll == null ) {
coll = new FragCollection(msg);
fragpieces.put(key, coll);
@@ -135,7 +135,7 @@
public void heartbeat() {
try {
- Set set = fragpieces.keySet();
+ Set<FragKey> set = fragpieces.keySet();
Object[] keys = set.toArray();
for ( int i=0; i<keys.length; i++ ) {
FragKey key = (FragKey)keys[i];
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Wed Dec 24 10:22:36 2008
@@ -183,7 +183,7 @@
public void startElection(boolean force) throws ChannelException {
synchronized (electionMutex) {
MemberImpl local = (MemberImpl)getLocalMember(false);
- MemberImpl[] others = (MemberImpl[])membership.getMembers();
+ MemberImpl[] others = membership.getMembers();
fireInterceptorEvent(new
CoordinationEvent(CoordinationEvent.EVT_START_ELECT,this,"Election initated"));
if ( others.length == 0 ) {
this.viewId = new UniqueId(UUIDGenerator.randomUUID(false));
@@ -221,7 +221,7 @@
fireInterceptorEvent(new
CoordinationEvent(CoordinationEvent.EVT_WAIT_FOR_MSG,this,"Election, waiting
for request"));
electionMutex.wait(waitForCoordMsgTimeout);
}catch ( InterruptedException x ) {
- Thread.currentThread().interrupted();
+ Thread.interrupted();
}
if ( suggestedviewId == null && (!coordMsgReceived.get())) {
//no message arrived, send the coord msg
@@ -241,7 +241,7 @@
Arrays.fill(m,others);
MemberImpl[] mbrs = m.getMembers();
m.reset();
- CoordinationMessage msg = new CoordinationMessage(leader, local,
mbrs,new UniqueId(UUIDGenerator.randomUUID(true)), this.COORD_REQUEST);
+ CoordinationMessage msg = new CoordinationMessage(leader, local,
mbrs,new UniqueId(UUIDGenerator.randomUUID(true)), COORD_REQUEST);
return msg;
}
@@ -257,7 +257,7 @@
boolean sent = false;
while ( !sent && current >= 0 ) {
try {
- sendElectionMsg(local, (MemberImpl) msg.getMembers()[current],
msg);
+ sendElectionMsg(local, msg.getMembers()[current], msg);
sent = true;
}catch ( ChannelException x ) {
log.warn("Unable to send election message
to:"+msg.getMembers()[current]);
@@ -323,8 +323,6 @@
Membership merged = mergeOnArrive(msg, sender);
if (isViewConf(msg)) handleViewConf(msg, sender, merged);
else handleToken(msg, sender, merged);
- ClassLoader loader;
-
}
protected void handleToken(CoordinationMessage msg, Member
sender,Membership merged) throws ChannelException {
@@ -349,14 +347,14 @@
suggestedView = new Membership(local,AbsoluteOrder.comp,true);
suggestedviewId = msg.getId();
Arrays.fill(suggestedView,merged.getMembers());
- msg.view = (MemberImpl[])merged.getMembers();
+ msg.view = merged.getMembers();
sendElectionMsgToNextInline(local,msg);
}
} else {
//leadership change
suggestedView = null;
suggestedviewId = null;
- msg.view = (MemberImpl[])merged.getMembers();
+ msg.view = merged.getMembers();
sendElectionMsgToNextInline(local,msg);
}
}
@@ -366,7 +364,7 @@
//I am the new leader
//startElection(false);
} else {
- msg.view = (MemberImpl[])merged.getMembers();
+ msg.view = merged.getMembers();
sendElectionMsgToNextInline(local,msg);
}
}
@@ -692,25 +690,25 @@
//header
int offset = 16;
//leader
- int ldrLen = buf.toInt(buf.getBytesDirect(),offset);
+ int ldrLen = XByteBuffer.toInt(buf.getBytesDirect(),offset);
offset += 4;
byte[] ldr = new byte[ldrLen];
System.arraycopy(buf.getBytesDirect(),offset,ldr,0,ldrLen);
leader = MemberImpl.getMember(ldr);
offset += ldrLen;
//source
- int srcLen = buf.toInt(buf.getBytesDirect(),offset);
+ int srcLen = XByteBuffer.toInt(buf.getBytesDirect(),offset);
offset += 4;
byte[] src = new byte[srcLen];
System.arraycopy(buf.getBytesDirect(),offset,src,0,srcLen);
source = MemberImpl.getMember(src);
offset += srcLen;
//view
- int mbrCount = buf.toInt(buf.getBytesDirect(),offset);
+ int mbrCount = XByteBuffer.toInt(buf.getBytesDirect(),offset);
offset += 4;
view = new MemberImpl[mbrCount];
for (int i=0; i<view.length; i++ ) {
- int mbrLen = buf.toInt(buf.getBytesDirect(),offset);
+ int mbrLen = XByteBuffer.toInt(buf.getBytesDirect(),offset);
offset += 4;
byte[] mbr = new byte[mbrLen];
System.arraycopy(buf.getBytesDirect(), offset, mbr, 0, mbrLen);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Wed Dec 24 10:22:36 2008
@@ -54,9 +54,9 @@
* @version 1.1
*/
public class OrderInterceptor extends ChannelInterceptorBase {
- private HashMap outcounter = new HashMap();
- private HashMap incounter = new HashMap();
- private HashMap incoming = new HashMap();
+ private HashMap<Member, Counter> outcounter = new HashMap<Member,
Counter>();
+ private HashMap<Member, Counter> incounter = new HashMap<Member,
Counter>();
+ private HashMap<Member, MessageOrder> incoming = new HashMap<Member,
MessageOrder>();
private long expire = 3000;
private boolean forwardExpired = true;
private int maxQueue = Integer.MAX_VALUE;
@@ -110,7 +110,7 @@
}
}
protected void processLeftOvers(Member member, boolean force) {
- MessageOrder tmp = (MessageOrder)incoming.get(member);
+ MessageOrder tmp = incoming.get(member);
if ( force ) {
Counter cnt = getInCounter(member);
cnt.setCounter(Integer.MAX_VALUE);
@@ -127,7 +127,7 @@
Member member = order.getMessage().getAddress();
Counter cnt = getInCounter(member);
- MessageOrder tmp = (MessageOrder)incoming.get(member);
+ MessageOrder tmp = incoming.get(member);
if ( tmp != null ) {
order = MessageOrder.add(tmp,order);
}
@@ -189,7 +189,7 @@
}
protected Counter getInCounter(Member mbr) {
- Counter cnt = (Counter)incounter.get(mbr);
+ Counter cnt = incounter.get(mbr);
if ( cnt == null ) {
cnt = new Counter();
cnt.inc(); //always start at 1 for incoming
@@ -199,7 +199,7 @@
}
protected Counter getOutCounter(Member mbr) {
- Counter cnt = (Counter)outcounter.get(mbr);
+ Counter cnt = outcounter.get(mbr);
if ( cnt == null ) {
cnt = new Counter();
outcounter.put(mbr,cnt);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/StaticMembershipInterceptor.java
Wed Dec 24 10:22:36 2008
@@ -25,7 +25,7 @@
public class StaticMembershipInterceptor
extends ChannelInterceptorBase {
- protected ArrayList members = new ArrayList();
+ protected ArrayList<Member> members = new ArrayList<Member>();
protected Member localMember = null;
public StaticMembershipInterceptor() {
@@ -66,7 +66,7 @@
Member[] others = super.getMembers();
Member[] result = new Member[members.size() + others.length];
for (int i = 0; i < others.length; i++) result[i] = others[i];
- for (int i = 0; i < members.size(); i++) result[i +
others.length] = (Member) members.get(i);
+ for (int i = 0; i < members.size(); i++) result[i +
others.length] = members.get(i);
AbsoluteOrder.absoluteOrder(result);
return result;
}//sync
@@ -79,7 +79,7 @@
* @return Member
*/
public Member getMember(Member mbr) {
- if ( members.contains(mbr) ) return
(Member)members.get(members.indexOf(mbr));
+ if ( members.contains(mbr) ) return members.get(members.indexOf(mbr));
else return super.getMember(mbr);
}
@@ -101,7 +101,7 @@
public void start(int svc) throws ChannelException {
if ( (Channel.SND_RX_SEQ&svc)==Channel.SND_RX_SEQ )
super.start(Channel.SND_RX_SEQ);
if ( (Channel.SND_TX_SEQ&svc)==Channel.SND_TX_SEQ )
super.start(Channel.SND_TX_SEQ);
- final Member[] mbrs = (Member[])members.toArray(new
Member[members.size()]);
+ final Member[] mbrs = members.toArray(new Member[members.size()]);
final ChannelInterceptorBase base = this;
Thread t = new Thread() {
public void run() {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Wed Dec 24 10:22:36 2008
@@ -78,9 +78,9 @@
protected Membership membership = null;
- protected HashMap removeSuspects = new HashMap();
+ protected HashMap<Member, Long> removeSuspects = new HashMap<Member,
Long>();
- protected HashMap addSuspects = new HashMap();
+ protected HashMap<Member, Long> addSuspects = new HashMap<Member, Long>();
public void sendMessage(Member[] destination, ChannelMessage msg,
InterceptorPayload payload) throws ChannelException {
try {
@@ -119,7 +119,7 @@
if (removeSuspects.containsKey(member)) {
//previously marked suspect, system below picked up the member
again
removeSuspects.remove(member);
- } else if (membership.getMember( (MemberImpl) member) == null){
+ } else if (membership.getMember(member) == null){
//if we add it here, then add it upwards too
//check to see if it is alive
if (memberAlive(member)) {
@@ -213,7 +213,7 @@
if (membership.getMember(members[i])!=null) {
membership.removeMember((MemberImpl)members[i]);
removeSuspects.remove(members[i]);
- super.memberDisappeared((MemberImpl)members[i]);
+ super.memberDisappeared(members[i]);
}
} //end if
} //for
@@ -237,9 +237,9 @@
//check suspect members if they are still alive,
//if not, simply issue the memberDisappeared message
- MemberImpl[] keys = (MemberImpl[]) removeSuspects.keySet().toArray(new
MemberImpl[removeSuspects.size()]);
+ MemberImpl[] keys = removeSuspects.keySet().toArray(new
MemberImpl[removeSuspects.size()]);
for (int i = 0; i < keys.length; i++) {
- MemberImpl m = (MemberImpl) keys[i];
+ MemberImpl m = keys[i];
if (membership.getMember(m) != null && (!memberAlive(m))) {
membership.removeMember(m);
super.memberDisappeared(m);
@@ -251,9 +251,9 @@
//check add suspects members if they are alive now,
//if they are, simply issue the memberAdded message
- keys = (MemberImpl[]) addSuspects.keySet().toArray(new
MemberImpl[addSuspects.size()]);
+ keys = addSuspects.keySet().toArray(new
MemberImpl[addSuspects.size()]);
for (int i = 0; i < keys.length; i++) {
- MemberImpl m = (MemberImpl) keys[i];
+ MemberImpl m = keys[i];
if ( membership.getMember(m) == null && (memberAlive(m))) {
membership.memberAlive(m);
super.memberAdded(m);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/ThroughputInterceptor.java
Wed Dec 24 10:22:36 2008
@@ -64,11 +64,11 @@
if ( access.get() == 1 ) access.addAndGet(-1);
throw x;
}
- mbTx += ((double)(bytes*destination.length))/(1024d*1024d);
- mbAppTx += ((double)(bytes))/(1024d*1024d);
+ mbTx += (bytes*destination.length)/(1024d*1024d);
+ mbAppTx += bytes/(1024d*1024d);
if ( access.addAndGet(-1) == 0 ) {
long stop = System.currentTimeMillis();
- timeTx += ( (double) (stop - txStart)) / 1000d;
+ timeTx += (stop - txStart) / 1000d;
if ((msgTxCnt.get() / interval) >= lastCnt) {
lastCnt++;
report(timeTx);
@@ -80,7 +80,7 @@
public void messageReceived(ChannelMessage msg) {
if ( rxStart == 0 ) rxStart = System.currentTimeMillis();
long bytes =
XByteBuffer.getDataPackageLength(((ChannelData)msg).getDataPackageLength());
- mbRx += ((double)bytes)/(1024d*1024d);
+ mbRx += bytes/(1024d*1024d);
msgRxCnt.addAndGet(1);
if ( msgRxCnt.get() % interval == 0 ) report(timeTx);
super.messageReceived(msg);
@@ -103,7 +103,7 @@
buf.append(msgTxErr).append("\n\tRx Msg:");
buf.append(msgRxCnt);
buf.append(" messages\n\tRx Speed:");
-
buf.append(df.format(mbRx/((double)((System.currentTimeMillis()-rxStart)/1000))));
+
buf.append(df.format(mbRx/((System.currentTimeMillis()-rxStart)/1000)));
buf.append(" MB/sec (since 1st msg)\n\tReceived:");
buf.append(df.format(mbRx)).append(" MB]\n");
if ( log.isInfoEnabled() ) log.info(buf);
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Wed Dec 24 10:22:36 2008
@@ -44,7 +44,7 @@
public static final byte[] END_DATA = new byte[] {54, -13, 90, 110, 47,
-31, 75, -24, -81, -29, 36, 52, -58, 77, -110, 56};
private static org.apache.juli.logging.Log log =
org.apache.juli.logging.LogFactory.getLog(TwoPhaseCommitInterceptor.class);
- protected HashMap messages = new HashMap();
+ protected HashMap<UniqueId, MapEntry> messages = new HashMap<UniqueId,
MapEntry>();
protected long expire = 1000 * 60; //one minute expiration
protected boolean deepclone = true;
@@ -79,7 +79,7 @@
Arrays.contains(msg.getMessage().getBytesDirect(),0,START_DATA,0,START_DATA.length)
&&
Arrays.contains(msg.getMessage().getBytesDirect(),START_DATA.length+msg.getUniqueId().length,END_DATA,0,END_DATA.length)
) {
UniqueId id = new
UniqueId(msg.getMessage().getBytesDirect(),START_DATA.length,msg.getUniqueId().length);
- MapEntry original = (MapEntry)messages.get(id);
+ MapEntry original = messages.get(id);
if ( original != null ) {
super.messageReceived(original.msg);
messages.remove(id);
@@ -113,9 +113,9 @@
public void heartbeat() {
try {
long now = System.currentTimeMillis();
- Map.Entry[] entries = (Map.Entry[])messages.entrySet().toArray(new
Map.Entry[messages.size()]);
+ Map.Entry<UniqueId,MapEntry>[] entries =
messages.entrySet().toArray(new Map.Entry[messages.size()]);
for (int i=0; i<entries.length; i++ ) {
- MapEntry entry = (MapEntry)entries[i].getValue();
+ MapEntry entry = entries[i].getValue();
if ( entry.expired(now,expire) ) {
if(log.isInfoEnabled())
log.info("Message ["+entry.id+"] has expired.
Removing.");
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=729351&r1=729350&r2=729351&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Wed
Dec 24 10:22:36 2008
@@ -60,7 +60,7 @@
/**
* sort members by alive time
*/
- protected Comparator<MemberImpl> memberComparator = new MemberComparator();
+ protected Comparator<Member> memberComparator = new MemberComparator();
public Object clone() {
synchronized (members) {
@@ -85,11 +85,11 @@
this(local,false);
}
- public Membership(MemberImpl local, Comparator<MemberImpl> comp) {
+ public Membership(MemberImpl local, Comparator<Member> comp) {
this(local,comp,false);
}
- public Membership(MemberImpl local, Comparator<MemberImpl> comp, boolean
includeLocal) {
+ public Membership(MemberImpl local, Comparator<Member> comp, boolean
includeLocal) {
this(local,includeLocal);
this.memberComparator = comp;
}
@@ -264,9 +264,9 @@
// --------------------------------------------- Inner Class
- private class MemberComparator implements Comparator<MemberImpl> {
+ private class MemberComparator implements Comparator<Member> {
- public int compare(MemberImpl m1, MemberImpl m2) {
+ public int compare(Member m1, Member m2) {
//longer alive time, means sort first
long result = m2.getMemberAliveTime() - m1.getMemberAliveTime();
if (result < 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
