Changeset 13029 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-10-21T14:17:17+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15462 - catch UnsatisfiedLinkError in case of JRE badly installed

File:

• trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -160 +160 @@
 
         try {
-                tile.finishLoading(); // whatever happened set that loading has finished
-                // set tile metadata
-                if (this.attributes != null) {
-                    for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
-                        tile.putValue(e.getKey(), e.getValue());
+            tile.finishLoading(); // whatever happened set that loading has finished
+            // set tile metadata
+            if (this.attributes != null) {
+                for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
+                    tile.putValue(e.getKey(), e.getValue());
+                }
+            }
+
+            switch(result) {
+            case SUCCESS:
+                handleNoTileAtZoom();
+                if (attributes != null) {
+                    int httpStatusCode = attributes.getResponseCode();
+                    if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
+                        if (attributes.getErrorMessage() == null) {
+                            tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
+                        } else {
+                            tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
+                        }
+                        status = false;
                     }
                 }
-
-                switch(result) {
-                case SUCCESS:
-                    handleNoTileAtZoom();
-                    if (attributes != null) {
-                        int httpStatusCode = attributes.getResponseCode();
-                        if (httpStatusCode >= 400 && !isNoTileAtZoom()) {
-                            if (attributes.getErrorMessage() == null) {
-                                tile.setError(tr("HTTP error {0} when loading tiles", httpStatusCode));
-                            } else {
-                                tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
-                            }
-                            status = false;
-                        }
-                    }
-                    status &= tryLoadTileImage(object); //try to keep returned image as background
-                    break;
-                case FAILURE:
-                    tile.setError("Problem loading tile");
-                    tryLoadTileImage(object);
-                    break;
-                case CANCELED:
-                    tile.loadingCanceled();
-                    // do nothing
-                }
+                status &= tryLoadTileImage(object); //try to keep returned image as background
+                break;
+            case FAILURE:
+                tile.setError("Problem loading tile");
+                tryLoadTileImage(object);
+                break;
+            case CANCELED:
+                tile.loadingCanceled();
+                // do nothing
+            }
 
             // always check, if there is some listener interested in fact, that tile has finished loading
@@ -270 +270 @@
             byte[] content = object.getContent();
             if (content.length > 0) {
-                tile.loadImage(new ByteArrayInputStream(content));
+                try {
+                    tile.loadImage(new ByteArrayInputStream(content));
+                } catch (UnsatisfiedLinkError e) {
+                    throw new IOException(e);
+                }
                 if (tile.getImage() == null) {
                     tile.setError(tr("Could not load image from tile server"));