Changes between Version 1 and Version 4 of Ticket #18534


Ignore:
Timestamp:
2020-01-08T16:50:22+01:00 (6 years ago)
Author:
taylor.smock
Comment:

Both patches fix the problem, tested using Fedora 31 (it also froze when opening the imagery menu).

So its pretty much up to personal preferences as to which patch is better.

josm.jnlp diff, since webstart does odd things sometimes:

  • josm.jnlp

     
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE jnlp PUBLIC "-//Sun Microsystems, Inc//DTD JNLP Descriptor 6.0//EN" "http://java.sun.com/dtd/JNLP-6.0.dtd">
    3 <jnlp spec="6.0+" codebase="https://josm.openstreetmap.de/download/" href="josm.jnlp">
     3<jnlp spec="6.0+" codebase="./" href="josm.jnlp">
    44    <information>
    55        <title>JOSM</title>
    6         <vendor>OpenStreetMap</vendor> 
    7         <homepage href="https://josm.openstreetmap.de"/> 
     6        <vendor>OpenStreetMap</vendor>
     7        <homepage href="https://josm.openstreetmap.de"/>
    88        <description>Java OpenStreetMap editor</description>
    99        <description kind="one-line">JOSM</description>
    1010        <description kind="tooltip">JOSM</description>
    1111        <icon href="https://josm.openstreetmap.de/logo.png" width="256" height="256"/>
    12         <icon href="https://josm.openstreetmap.de/logo64.png" width="64" height="64" kind="shortcut"/> 
     12        <icon href="https://josm.openstreetmap.de/logo64.png" width="64" height="64" kind="shortcut"/>
    1313        <offline-allowed/>
     14        <association mime-type="application/xml application/json" extensions="geojson osm"/>
    1415        <shortcut>
    1516            <desktop/>
    1617            <menu/>
    … …  
    2021        <all-permissions/>
    2122    </security>
    2223    <resources>
    23         <java version="1.8+" max-heap-size="2048m" java-vm-args="--add-modules=java.scripting,java.sql --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED"/>
    24         <jar href="josm-tested.jar"/>
     24        <java version="1.8+" max-heap-size="4096m" java-vm-args="--add-modules=java.scripting,java.sql --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED"/>
     25        <jar href="dist/josm-custom.jar"/>
    2526        <property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
    2627    </resources>
    27     <application-desc main-class="org.openstreetmap.josm.gui.MainApplication"/>
     28    <application-desc main-class="org.openstreetmap.josm.gui.MainApplication">
     29    </application-desc>
    2830</jnlp>

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #18534

    • Property Component Applet → Core Webstart
    • Property Summary [Possible Patch] Some locations cause JOSM jnlp to freeze when opening the `Imagery` menu → [Patch] Some locations cause JOSM jnlp to freeze when opening the `Imagery` menu

  • Ticket #18534 – Description

    v1 v4  
    1 This ''may'' be Mac OS X only.
     1~~This ''may'' be Mac OS X only.~~ Also appears to occur on Fedora 31 (there is a pop up security warning, probably related to #18390). Same symptoms (except for the spinning pinwheel of death).
    22
    33The issue appears to be on source:trunk/src/org/openstreetmap/josm/tools/ImageProvider.java#L858 -- cache remains locked by another thread indefinitely.
    … …  
    77Alternatively, we could just wrap it in a `Collections.synchronizedMap`.
    88
    9 Please note that ''I have not'' tested it yet -- I need to figure out how to run a `jnlp` from a local source. I may end up having to spin up a server for it.
     9~~Please note that ''I have not'' tested it yet -- I need to figure out how to run a `jnlp` from a local source. I may end up having to spin up a server for it.~~
    1010
    1111
    1212Steps to reproduce:
    13131) Start josm.jnlp (josm-latest.jnlp works as well)
    14 2) 'https://api.openstreetmap.org/api/0.6/map?bbox=-47.8898656,-15.8114964,-47.8875375,-15.8092976' is the test area
     142) 'http://localhost:8111/load_and_zoom?left=-47.8898656&bottom=-15.8114964&right=-47.8875375&top=-15.8092976' is the test area
    15153) Open `Imagery` menu