Changeset 10469 in josm for trunk/src/org/openstreetmap/josm/data/cache

Timestamp:

2016-06-24T01:27:35+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S1166 - Exception handlers should preserve the original exceptions

Location:

trunk/src/org/openstreetmap/josm/data/cache

Files:

• CacheEntryAttributes.java (modified) (1 diff)
• JCSCachedTileLoaderJob.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java

@@ -188 +188 @@
 
     /**
+     * @param error error related to this object
+     * @since 10469
+     */
+    public void setError(Exception error) {
+        setErrorMessage(Main.getErrorMessage(error));
+    }
+
+    /**
      * @param message error message related to this object
      */

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -378 +378 @@
             log.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrlNoException());
             attributes.setResponseCode(404);
-            attributes.setErrorMessage(e.toString());
+            attributes.setError(e);
             boolean doCache = isResponseLoadable(null, 404, null) || cacheAsEmpty();
             if (doCache) {
@@ -387 +387 @@
         } catch (IOException e) {
             log.log(Level.FINE, "JCS - IOExecption during communication with server for: {0}", getUrlNoException());
-            attributes.setErrorMessage(e.toString());
+            attributes.setError(e);
             attributes.setResponseCode(499); // set dummy error code
             boolean doCache = isResponseLoadable(null, 499, null) || cacheAsEmpty(); //generic 499 error code returned
@@ -396 +396 @@
             return doCache;
         } catch (InterruptedException e) {
-            attributes.setErrorMessage(e.toString());
+            attributes.setError(e);
             log.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException());
             Main.warn(e);