Changeset 6311 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-10-07T01:49:19+02:00 (11 years ago)

Author:

Don-vip

Message:

Avoid NPE when logging exception without message

File:

• trunk/src/org/openstreetmap/josm/Main.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -293 +293 @@
      */
     public static void error(Throwable t) {
-        error(t.getClass().getName()+": "+t.getMessage().trim());
+        error(getErrorMessage(t));
     }
     
@@ -302 +302 @@
      */
     public static void warn(Throwable t) {
-        warn(t.getClass().getName()+": "+t.getMessage().trim());
+        warn(getErrorMessage(t));
+    }
+    
+    private static String getErrorMessage(Throwable t) {
+        StringBuilder sb = new StringBuilder(t.getClass().getName());
+        String msg = t.getMessage();
+        if (msg != null) {
+            sb.append(": ").append(msg.trim());
+        }
+        return sb.toString();
     }