Repository: hbase Updated Branches: refs/heads/branch-1.1 93ac76ef6 -> 4a75661da
HBASE-17944 - Removed unused JDK version parsing from ClassSize. Signed-off-by: Sean Busbey <bus...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4a75661d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4a75661d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4a75661d Branch: refs/heads/branch-1.1 Commit: 4a75661da29c7a18822d81dee7f57205277c76c1 Parents: 93ac76e Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Fri Apr 21 09:16:01 2017 +0100 Committer: Sean Busbey <bus...@apache.org> Committed: Fri Apr 21 10:07:04 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/util/ClassSize.java | 14 -------------- 1 file changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/4a75661d/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java index 1bb34e1..0d53794 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java @@ -110,20 +110,6 @@ public class ClassSize { /** Overhead for CellSkipListSet */ public static final int CELL_SKIPLIST_SET; - /* Are we running on jdk7? */ - private static final boolean JDK7; - static { - final String version = System.getProperty("java.version"); - // Verify String looks like this: 1.6.0_29 - if (!version.matches("\\d\\.\\d\\..*")) { - throw new RuntimeException("Unexpected version format: " + version); - } - // Convert char to int - int major = (int)(version.charAt(0) - '0'); - int minor = (int)(version.charAt(2) - '0'); - JDK7 = major == 1 && minor == 7; - } - /** * Method for reading the arc settings and setting overheads according * to 32-bit or 64-bit architecture.
