From b776646bd1a8c9bb2505ef5ef5371e4dc6aab979 Mon Sep 17 00:00:00 2001 From: bd2019us <> Date: Sat, 20 Apr 2019 21:06:25 -0500 Subject: [PATCH] [HADOOP-16267] Change replaceAll() to replace Changed instances of replaceAll() which do not use regex to replace() --- .../src/main/java/org/apache/hadoop/util/PrintJarMainClass.java | 2 +- .../main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java | 2 +- .../src/main/java/org/apache/hadoop/yarn/state/Graph.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/PrintJarMainClass.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/PrintJarMainClass.java index efa4de3ea2..1fc1944be7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/PrintJarMainClass.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/PrintJarMainClass.java @@ -41,7 +41,7 @@ public static void main(String[] args) { if (manifest != null) { String value = manifest.getMainAttributes().getValue("Main-Class"); if (value != null) { - System.out.println(value.replaceAll("/", ".")); + System.out.println(value.replace("/", ".")); return; } } diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java index 197edd91c3..797d9eef41 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java @@ -134,7 +134,7 @@ private void deleteAttemptTempFiles(Path targetWorkPath, String jobId) throws IOException { FileStatus[] tempFiles = targetFS.globStatus( - new Path(targetWorkPath, ".distcp.tmp." + jobId.replaceAll("job","attempt") + "*")); + new Path(targetWorkPath, ".distcp.tmp." + jobId.replace("job","attempt") + "*")); if (tempFiles != null && tempFiles.length > 0) { for (FileStatus file : tempFiles) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java index 235d673942..60e1d6f023 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/state/Graph.java @@ -138,7 +138,7 @@ public void addSubGraph(Graph graph) { private static String wrapSafeString(String label) { if (label.indexOf(',') >= 0) { if (label.length()>14) { - label = label.replaceAll(",", ",\n"); + label = label.replace(",", ",\n"); } } label = "\"" + StringEscapeUtils.escapeJava(label) + "\"";