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 we...@apache.org on 2019/06/18 19:01:35 UTC
[hadoop] branch trunk updated: HDFS-14078. Admin helper fails to
prettify NullPointerExceptions. Contributed by Elek, Marton.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 81ec909 HDFS-14078. Admin helper fails to prettify NullPointerExceptions. Contributed by Elek, Marton.
81ec909 is described below
commit 81ec90941160cc5f75370ee45af22c6b47c3c94b
Author: Elek, Marton <el...@apache.org>
AuthorDate: Tue Jun 18 11:59:10 2019 -0700
HDFS-14078. Admin helper fails to prettify NullPointerExceptions. Contributed by Elek, Marton.
Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
---
.../org/apache/hadoop/hdfs/tools/AdminHelper.java | 10 ++++-
.../apache/hadoop/hdfs/tools/TestAdminHelper.java | 50 ++++++++++++++++++++++
2 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
index 391dcb6..9cb646b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/AdminHelper.java
@@ -65,8 +65,14 @@ public class AdminHelper {
* When it's a known error, pretty-print the error and squish the stack trace.
*/
static String prettifyException(Exception e) {
- return e.getClass().getSimpleName() + ": "
- + e.getLocalizedMessage().split("\n")[0];
+ if (e.getLocalizedMessage() != null) {
+ return e.getClass().getSimpleName() + ": "
+ + e.getLocalizedMessage().split("\n")[0];
+ } else if (e.getStackTrace() != null && e.getStackTrace().length > 0) {
+ return e.getClass().getSimpleName() + " at " + e.getStackTrace()[0];
+ } else {
+ return e.getClass().getSimpleName();
+ }
}
static TableListing getOptionDescriptionListing() {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestAdminHelper.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestAdminHelper.java
new file mode 100644
index 0000000..f99ef01
--- /dev/null
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestAdminHelper.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs.tools;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test class to test Admin Helper.
+ */
+public class TestAdminHelper {
+
+ @Test
+ public void prettifyExceptionWithNpe() {
+ String pretty = AdminHelper.prettifyException(new NullPointerException());
+ Assert.assertTrue(
+ "Prettified exception message doesn't contain the required exception "
+ + "message",
+ pretty.startsWith("NullPointerException at org.apache.hadoop.hdfs.tools"
+ + ".TestAdminHelper.prettifyExceptionWithNpe"));
+ }
+
+ @Test
+ public void prettifyException() {
+
+ String pretty = AdminHelper.prettifyException(
+ new IllegalArgumentException("Something is wrong",
+ new IllegalArgumentException("Something is illegal")));
+
+ Assert.assertEquals(
+ "IllegalArgumentException: Something is wrong",
+ pretty);
+
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org