Changeset 13650 in josm for trunk

Timestamp:

2018-04-19T23:04:48+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16204 - fix unit test, checkstyle

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/protocols/data/Handler.java (modified) (2 diffs)
• tools/checkstyle/josm_checks.xml (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/protocols/data/Handler.java

@@ -6 +6 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.util.Optional;
 
 import org.openstreetmap.josm.tools.Utils;
@@ -31 +32 @@
 
         String protocolHandlers = Utils.getSystemProperty("java.protocol.handler.pkgs");
-        if (protocolHandlers != null && !protocolHandlers.contains(pkg)) {
-            StringBuilder sb = new StringBuilder(protocolHandlers);
+        if (protocolHandlers == null || !protocolHandlers.contains(pkg)) {
+            StringBuilder sb = new StringBuilder(Optional.ofNullable(protocolHandlers).orElse(""));
             if (sb.length() > 0) {
                 sb.append('|');

trunk/tools/checkstyle/josm_checks.xml

@@ -113 +113 @@
   <module name="FileLength">
     <property name="fileExtensions" value=".java"/>
+    <property name="max" value="2500"/>
   </module>
   <module name="FileTabCharacter"/>