Changeset 18486 in josm for trunk/src/org/openstreetmap

Timestamp:

2022-06-13T15:42:34+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix CID 1489883: Dereference null return value

This was introduced in r18475, but it was unlikely to ever be a problem,
as the constructor used sets the default element attributes to a non-null
value.

File:

• trunk/src/org/openstreetmap/josm/tools/PatternUtils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/PatternUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 import org.apache.commons.jcs3.access.CacheAccess;
+import org.apache.commons.jcs3.engine.ElementAttributes;
 import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
 import org.openstreetmap.josm.data.cache.JCSCacheManager;
@@ -24 +26 @@
     static {
         // We don't want to keep these around forever, so set a reasonablish max idle life.
-        final IElementAttributes defaultAttributes = cache.getDefaultElementAttributes();
+        final IElementAttributes defaultAttributes = Optional.ofNullable(cache.getDefaultElementAttributes()).orElseGet(
+                ElementAttributes::new);
         defaultAttributes.setIdleTime(TimeUnit.HOURS.toSeconds(1));
         cache.setDefaultElementAttributes(defaultAttributes);