Changeset 6474 in josm for trunk/src/org/openstreetmap/josm/Main.java

Timestamp:

2013-12-16T00:22:44+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9434 - Robustness in hash URLs parsing

File:

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

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

@@ -212 +212 @@
      */
     public static int logLevel = 3;
-    
+
     /**
      * Prints an error message if logging is on.
@@ -223 +223 @@
         System.err.println(tr("ERROR: {0}", msg));
     }
-    
+
     /**
      * Prints a warning message if logging is on.
@@ -233 +233 @@
         System.err.println(tr("WARNING: {0}", msg));
     }
-    
+
     /**
      * Prints an informational message if logging is on.
@@ -243 +243 @@
         System.out.println(tr("INFO: {0}", msg));
     }
-    
+
     /**
      * Prints a debug message if logging is on.
@@ -253 +253 @@
         System.out.println(tr("DEBUG: {0}", msg));
     }
-    
+
     /**
      * Prints a formated error message if logging is on. Calls {@link MessageFormat#format}
@@ -264 +264 @@
         error(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints a formated warning message if logging is on. Calls {@link MessageFormat#format}
@@ -274 +274 @@
         warn(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints a formated informational message if logging is on. Calls {@link MessageFormat#format}
@@ -284 +284 @@
         info(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints a formated debug message if logging is on. Calls {@link MessageFormat#format}
@@ -294 +294 @@
         debug(MessageFormat.format(msg, objects));
     }
-    
+
     /**
      * Prints an error message for the given Throwable.
@@ -303 +303 @@
         error(getErrorMessage(t));
     }
-    
+
     /**
      * Prints a warning message for the given Throwable.
@@ -312 +312 @@
         warn(getErrorMessage(t));
     }
-    
+
     private static String getErrorMessage(Throwable t) {
         StringBuilder sb = new StringBuilder(t.getClass().getName());
@@ -318 +318 @@
         if (msg != null) {
             sb.append(": ").append(msg.trim());
+        }
+        Throwable cause = t.getCause();
+        if (cause != null && !cause.equals(t)) {
+            sb.append(". ").append(tr("Cause: ")).append(getErrorMessage(cause));
         }
         return sb.toString();