Rest of fix required for https://issues.apache.org/bugzilla/show_bug.cgi?id=48113

Based on a patch by Quintin Beukes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@883362 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/tribes/util/Arrays.java b/java/org/apache/catalina/tribes/util/Arrays.java
index 87ebe0a..d4f3a43 100644 (file)
--- a/java/org/apache/catalina/tribes/util/Arrays.java
+++ b/java/org/apache/catalina/tribes/util/Arrays.java
@@ -62,10 +62,17 @@ public class Arrays {
     public static String toString(byte[] data, int offset, int length, boolean asInt) {
         StringBuilder buf = new StringBuilder("{");
         if ( data != null && length > 0 ) {
-            if (asInt) buf.append((int)data[offset++]);
-            else buf.append(data[offset++]);
-            for (int i = offset; i < length; i++) {
-                buf.append(", ").append(data[i]);
+            int i = offset;
+            if (asInt) {
+                buf.append(data[i++] & 0xff);
+                for (; i < length; i++) {
+                    buf.append(", ").append(data[i] & 0xff);
+                }
+            } else {
+                buf.append(data[i++]);
+                for (; i < length; i++) {
+                    buf.append(", ").append(data[i]);
+                }
             }
         }
         buf.append("}");