Changeset 10212 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol

Timestamp:

2016-05-15T00:51:10+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S2221 - "Exception" should not be caught when not required by called methods

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• RemoteControlHttpServer.java (modified) (2 diffs)
• RemoteControlHttpsServer.java (modified) (2 diffs)
• handler/ImportHandler.java (modified) (1 diff)
• handler/LoadAndZoomHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java

@@ -36 +36 @@
             instance4 = new RemoteControlHttpServer(port, false);
             instance4.start();
-        } catch (Exception ex) {
+        } catch (IOException ex) {
             Main.warn(marktr("Cannot start IPv4 remotecontrol server on port {0}: {1}"),
                     Integer.toString(port), ex.getLocalizedMessage());
@@ -43 +43 @@
             instance6 = new RemoteControlHttpServer(port, true);
             instance6.start();
-        } catch (Exception ex) {
+        } catch (IOException ex) {
             /* only show error when we also have no IPv4 */
             if (instance4 == null) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -333 +333 @@
                 instance4 = new RemoteControlHttpsServer(port, false);
                 instance4.start();
-            } catch (Exception ex) {
+            } catch (IOException | GeneralSecurityException ex) {
                 Main.warn(marktr("Cannot start IPv4 remotecontrol https server on port {0}: {1}"),
                         Integer.toString(port), ex.getLocalizedMessage());
@@ -340 +340 @@
                 instance6 = new RemoteControlHttpsServer(port, true);
                 instance6.start();
-            } catch (Exception ex) {
+            } catch (IOException | GeneralSecurityException ex) {
                 /* only show error when we also have no IPv4 */
                 if (instance4 == null) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -47 +47 @@
                 }
             }
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             Main.warn("RemoteControl: Error parsing import remote control request:");
             Main.error(ex);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -145 +145 @@
                 }
             }
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             Main.warn("RemoteControl: Error parsing load_and_zoom remote control request:");
             Main.error(ex);