From 64dbc7813e8d5419d2802750e7749b1fa979819b Mon Sep 17 00:00:00 2001 From: Adam Retter Date: Tue, 11 Dec 2018 11:04:39 -0800 Subject: [PATCH] RocksJava must compile on JDK7 (#4768) Summary: Fixes some RocksJava regressions recently introduced, whereby RocksJava would not build on JDK 7. These should have been visible on Travis-CI! Pull Request resolved: https://github.com/facebook/rocksdb/pull/4768 Differential Revision: D13418173 Pulled By: sagar0 fbshipit-source-id: 57bf223188887f84d9e072031af2e0d2c8a69c30 --- java/src/main/java/org/rocksdb/MemoryUsageType.java | 8 ++++---- java/src/test/java/org/rocksdb/MergeTest.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/src/main/java/org/rocksdb/MemoryUsageType.java b/java/src/main/java/org/rocksdb/MemoryUsageType.java index 3523cd0e..6010ce7a 100644 --- a/java/src/main/java/org/rocksdb/MemoryUsageType.java +++ b/java/src/main/java/org/rocksdb/MemoryUsageType.java @@ -54,9 +54,9 @@ public enum MemoryUsageType { * cannot be found */ public static MemoryUsageType getMemoryUsageType(final byte byteIdentifier) { - for (final MemoryUsageType MemoryUsageType : MemoryUsageType.values()) { - if (MemoryUsageType.getValue() == byteIdentifier) { - return MemoryUsageType; + for (final MemoryUsageType memoryUsageType : MemoryUsageType.values()) { + if (memoryUsageType.getValue() == byteIdentifier) { + return memoryUsageType; } } @@ -64,7 +64,7 @@ public enum MemoryUsageType { "Illegal value provided for MemoryUsageType."); } - private MemoryUsageType(byte value) { + MemoryUsageType(byte value) { value_ = value; } diff --git a/java/src/test/java/org/rocksdb/MergeTest.java b/java/src/test/java/org/rocksdb/MergeTest.java index b2ec6263..55469847 100644 --- a/java/src/test/java/org/rocksdb/MergeTest.java +++ b/java/src/test/java/org/rocksdb/MergeTest.java @@ -46,13 +46,13 @@ public class MergeTest { } private byte[] longToByteArray(long l) { - ByteBuffer buf = ByteBuffer.allocate(Long.BYTES); + ByteBuffer buf = ByteBuffer.allocate(Long.SIZE / Byte.SIZE); buf.putLong(l); return buf.array(); } private long longFromByteArray(byte[] a) { - ByteBuffer buf = ByteBuffer.allocate(Long.BYTES); + ByteBuffer buf = ByteBuffer.allocate(Long.SIZE / Byte.SIZE); buf.put(a); buf.flip(); return buf.getLong(); -- 2.47.3