You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2017/07/11 23:02:17 UTC

hadoop git commit: HADOOP-14586. StringIndexOutOfBoundsException breaks org.apache.hadoop.util.Shell on 2.7.x with Java 9. Contributed by Uwe Schindler.

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 0ee637f84 -> c5e9a15e1


HADOOP-14586. StringIndexOutOfBoundsException breaks org.apache.hadoop.util.Shell on 2.7.x with Java 9. Contributed by Uwe Schindler.

Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5e9a15e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5e9a15e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5e9a15e

Branch: refs/heads/branch-2.7
Commit: c5e9a15e1e2d6e12412159b6a1effa640f4bd235
Parents: 0ee637f
Author: Konstantin V Shvachko <sh...@apache.org>
Authored: Tue Jul 11 16:01:58 2017 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Tue Jul 11 16:01:58 2017 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt               | 4 ++++
 .../src/main/java/org/apache/hadoop/util/Shell.java           | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5e9a15e/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 45efb50..ee8879e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -9,6 +9,7 @@ Release 2.7.4 - UNRELEASED
   NEW FEATURES
 
   IMPROVEMENTS
+
     HADOOP-12259. Utility to Dynamic port allocation (brahmareddy via rkanter)
 
     HADOOP-10597. RPC Server signals backoff to clients when all request
@@ -162,6 +163,9 @@ Release 2.7.4 - UNRELEASED
     HADOOP-14044. Synchronization issue in delegation token cancel
     functionality. (Hrishikesh Gadre via xiao)
 
+    HADOOP-14586. StringIndexOutOfBoundsException breaks
+    org.apache.hadoop.util.Shell on 2.7.x with Java 9. (Uwe Schindler via shv)
+
 Release 2.7.3 - 2016-08-25
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5e9a15e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
index cc4d76e..626ac1f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java
@@ -48,8 +48,11 @@ abstract public class Shell {
   
   public static final Log LOG = LogFactory.getLog(Shell.class);
   
-  private static boolean IS_JAVA7_OR_ABOVE =
-      System.getProperty("java.version").substring(0, 3).compareTo("1.7") >= 0;
+  /**
+   * java.version is enforced via maven-enforcer-plugin.
+   * Starting from Hadoop 2.7.0 Java 1.7 or higher is required.
+   */
+  private static boolean IS_JAVA7_OR_ABOVE = true;
 
   public static boolean isJava7OrAbove() {
     return IS_JAVA7_OR_ABOVE;


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org