Merge pull request #763 from alecgrieser/000761-getuserversion-order-…

…of-operations Fix issue with Versionstamp::getUserVersion on larger user versions
apple · Sep 11, 2018 · 9e8c194 · 9e8c194
2 parents 79f1b89 + 5128d97
commit 9e8c194
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bindings/java/src/main/com/apple/foundationdb/tuple/Versionstamp.java b/bindings/java/src/main/com/apple/foundationdb/tuple/Versionstamp.java
@@ -107,7 +107,7 @@ public class Versionstamp implements Comparable<Versionstamp> {
 	 * @return the unpacked user version included in the array
 	 */
 	public static int unpackUserVersion(byte[] bytes, int pos) {
-		return ((int)bytes[pos] & 0xff << 8) | ((int)bytes[pos + 1] & 0xff);
+		return (((int)bytes[pos] & 0xff) << 8) | ((int)bytes[pos + 1] & 0xff);
 	}
 
 	/**

diff --git a/documentation/sphinx/source/release-notes.rst b/documentation/sphinx/source/release-notes.rst
@@ -71,6 +71,7 @@ Bindings
 * Several cases where functions in go might previously cause a panic now return a non-``nil`` error. `(PR #532) <https://github.com/apple/foundationdb/pull/532>`_
 * C API calls made on the network thread could be reordered with calls made from other threads. [6.0.2] `(Issue #518) <https://github.com/apple/foundationdb/issues/518>`_
 * The TLS_PLUGIN option is now a no-op and has been deprecated. [6.0.10] `(PR #710) <https://github.com/apple/foundationdb/pull/710>`_
+* Java: the `Versionstamp::getUserVersion() </javadoc/com/apple/foundationdb/tuple/Versionstamp.html#getUserVersion-->`_ method did not handle user versions greater than ``0x00FF`` due to operator precedence errors. [6.0.11] `(Issue #761) <https://github.com/apple/foundationdb/issues/761>`_
 
 Other Changes
 -------------