hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From whe...@apache.org
Subject hadoop git commit: HADOOP-10068. Improve log4j regex in testFindContainingJar. Contributed by Robert Rati.
Date Mon, 23 Nov 2015 02:31:02 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk dc46c46b9 -> c3ba44d85


HADOOP-10068. Improve log4j regex in testFindContainingJar. Contributed by Robert Rati.


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

Branch: refs/heads/trunk
Commit: c3ba44d8586289faeb63bf23c58f808b2aa6b9f6
Parents: dc46c46
Author: Haohui Mai <wheat9@apache.org>
Authored: Sun Nov 22 18:29:03 2015 -0800
Committer: Haohui Mai <wheat9@apache.org>
Committed: Sun Nov 22 18:29:03 2015 -0800

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 .../src/test/java/org/apache/hadoop/util/TestClassUtil.java    | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3ba44d8/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 08a8bf4..26f97b4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1454,6 +1454,9 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12098. Remove redundant test dependencies in Hadoop Archives.
     (Varun Saxena via wheat9)
 
+    HADOOP-10068. Improve log4j regex in testFindContainingJar.
+    (Robert Rati via wheat9)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3ba44d8/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
index 14e19f4..4bc36e2 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java
@@ -32,9 +32,9 @@ public class TestClassUtil {
     Assert.assertNotNull("Containing jar not found for Logger", 
         containingJar);
     File jarFile = new File(containingJar);
-    Assert.assertTrue("Containing jar does not exist on file system", 
+    Assert.assertTrue("Containing jar does not exist on file system ",
         jarFile.exists());
-    Assert.assertTrue("Incorrect jar file" + containingJar,  
-        jarFile.getName().matches("log4j.+[.]jar"));
+    Assert.assertTrue("Incorrect jar file " + containingJar,
+        jarFile.getName().matches("log4j.*[.]jar"));
   }
 }


Mime
View raw message