svn commit: r1626009 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/jute/Utils.java

[fpj]

Author: fpj
Date: Thu Sep 18 15:51:08 2014
New Revision: 1626009

URL: http://svn.apache.org/r1626009
Log:
ZOOKEEPER-2039. Jute compareBytes incorrect comparison index (Ian Dimayuga via 
fpj)


Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/Utils.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1626009&r1=1626008&r2=1626009&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Thu Sep 18 15:51:08 2014
@@ -40,6 +40,8 @@ BUGFIXES:
   ZOOKEEPER-1222. getACL should only call DataTree.copyStat when passed in
   stat is not null (Michi Mutsuzaki via rakeshr)
 
+  ZOOKEEPER-2039. Jute compareBytes incorrect comparison index (Ian Dimayuga 
via fpj)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for

Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/Utils.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/Utils.java?rev=1626009&r1=1626008&r2=1626009&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/Utils.java 
(original)
+++ zookeeper/branches/branch-3.4/src/java/main/org/apache/jute/Utils.java Thu 
Sep 18 15:51:08 2014
@@ -268,15 +268,15 @@ public class Utils {
         return stream.toByteArray();
     }
     public static int compareBytes(byte b1[], int off1, int len1, byte b2[], 
int off2, int len2) {
-       int i;
-       for(i=0; i < len1 && i < len2; i++) {
-               if (b1[off1+i] != b2[off2+i]) {
-                       return b1[off1+i] < b2[off2+1] ? -1 : 1;
-               }
-       }
-       if (len1 != len2) {
-               return len1 < len2 ? -1 : 1;
-       }
-       return 0;
+        int i;
+        for(i=0; i < len1 && i < len2; i++) {
+            if (b1[off1+i] != b2[off2+i]) {
+                return b1[off1+i] < b2[off2+i] ? -1 : 1;
+            }
+        }
+        if (len1 != len2) {
+            return len1 < len2 ? -1 : 1;
+        }
+        return 0;
     }
 }