Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
- Timestamp:
- 2017-07-30T17:07:42+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r12537 r12542 81 81 82 82 83 private static final ConcurrentMap<String, Set<ICachedLoaderListener>> IN_PROGRESS= new ConcurrentHashMap<>();84 private static final ConcurrentMap<String, Boolean> USE_HEAD= new ConcurrentHashMap<>();83 private static final ConcurrentMap<String, Set<ICachedLoaderListener>> inProgress = new ConcurrentHashMap<>(); 84 private static final ConcurrentMap<String, Boolean> useHead = new ConcurrentHashMap<>(); 85 85 86 86 protected final long now; // when the job started … … 162 162 throw new IllegalArgumentException("No url returned"); 163 163 } 164 synchronized ( IN_PROGRESS) {165 Set<ICachedLoaderListener> newListeners = IN_PROGRESS.get(deduplicationKey);164 synchronized (inProgress) { 165 Set<ICachedLoaderListener> newListeners = inProgress.get(deduplicationKey); 166 166 if (newListeners == null) { 167 167 newListeners = new HashSet<>(); 168 IN_PROGRESS.put(deduplicationKey, newListeners);168 inProgress.put(deduplicationKey, newListeners); 169 169 first = true; 170 170 } … … 259 259 private void finishLoading(LoadResult result) { 260 260 Set<ICachedLoaderListener> listeners; 261 synchronized ( IN_PROGRESS) {261 synchronized (inProgress) { 262 262 try { 263 listeners = IN_PROGRESS.remove(getUrl().toString());263 listeners = inProgress.remove(getUrl().toString()); 264 264 } catch (IOException e) { 265 265 listeners = null; … … 312 312 // then just use HEAD request and check returned values 313 313 if (isObjectLoadable() && 314 Boolean.TRUE.equals( USE_HEAD.get(getServerKey())) &&314 Boolean.TRUE.equals(useHead.get(getServerKey())) && 315 315 isCacheValidUsingHead()) { 316 316 LOG.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl()); … … 346 346 LOG.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modified-Since or If-None-Match headers", 347 347 serverKey); 348 USE_HEAD.put(serverKey, Boolean.TRUE);348 useHead.put(serverKey, Boolean.TRUE); 349 349 } 350 350
Note:
See TracChangeset
for help on using the changeset viewer.