Author: fhanik
Date: Thu Feb 17 16:23:44 2011
New Revision: 1071677
URL: http://svn.apache.org/viewvc?rev=1071677&view=rev
Log:
Correctly use the readFully method. Add a utility method to sort absolute order
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
tomcat/trunk/java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java
(props changed)
tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
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=1071677&r1=1071676&r2=1071677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/AbsoluteOrder.java Thu
Feb 17 16:23:44 2011
@@ -19,6 +19,7 @@ package org.apache.catalina.tribes.group
import java.io.Serializable;
import java.util.Arrays;
import java.util.Comparator;
+import java.util.List;
import org.apache.catalina.tribes.Member;
@@ -53,10 +54,14 @@ public class AbsoluteOrder {
public static void absoluteOrder(Member[] members) {
- if ( members == null || members.length == 0 ) return;
+ if ( members == null || members.length <= 1 ) return;
Arrays.sort(members,comp);
}
+ public static void absoluteOrder(List<Member> members) {
+ if ( members == null || members.size() <= 1 ) return;
+ java.util.Collections.sort(members, comp);
+ }
public static class AbsoluteComparator implements Comparator<Member>,
Serializable {
Propchange:
tomcat/trunk/java/org/apache/catalina/tribes/group/ExtendedRpcCallback.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java?rev=1071677&r1=1071676&r2=1071677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcMessage.java Thu Feb
17 16:23:44 2011
@@ -56,10 +56,10 @@ public class RpcMessage implements Exter
reply = in.readBoolean();
int length = in.readInt();
uuid = new byte[length];
- in.read(uuid, 0, length);
+ in.readFully(uuid);
length = in.readInt();
rpcId = new byte[length];
- in.read(rpcId, 0, length);
+ in.readFully(rpcId);
message = (Serializable)in.readObject();
}
@@ -100,10 +100,10 @@ public class RpcMessage implements Exter
reply = true;
int length = in.readInt();
uuid = new byte[length];
- in.read(uuid, 0, length);
+ in.readFully(uuid);
length = in.readInt();
rpcId = new byte[length];
- in.read(rpcId, 0, length);
+ in.readFully(rpcId);
}
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1071677&r1=1071676&r2=1071677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Thu
Feb 17 16:23:44 2011
@@ -622,7 +622,7 @@ public class MemberImpl implements Membe
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
int length = in.readInt();
byte[] message = new byte[length];
- in.read(message);
+ in.readFully(message);
getMember(message,this);
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1071677&r1=1071676&r2=1071677&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Feb 17 16:23:44 2011
@@ -1427,7 +1427,7 @@ public abstract class AbstractReplicated
Member[] members = new Member[nodecount];
for ( int i=0; i<members.length; i++ ) {
byte[] d = new byte[in.readInt()];
- in.read(d);
+ in.readFully(d);
if (d.length > 0) members[i] = MemberImpl.getMember(d);
}
return members;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
