Merge Java 7 update (fix #1273)

1 files changed, 2 insertions, 6 deletions

diff --git a/src/org/traccar/http/JsonConverter.java b/src/org/traccar/http/JsonConverter.java
index d658ef7d6..d8773ec1f 100644
--- a/src/org/traccar/http/JsonConverter.java
+++ b/src/org/traccar/http/JsonConverter.java
@@ -30,7 +30,6 @@ import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonValue;
-
 import org.traccar.model.Factory;
 
 public class JsonConverter {
@@ -89,9 +88,7 @@ public class JsonConverter {
                         populateObject(json.getJsonObject(name), nestedObject);
                         method.invoke(object, nestedObject);
                     }
-                } catch (IllegalAccessException error) {
-                } catch (InvocationTargetException error) {
-                } catch (InstantiationException e) {
+                } catch (IllegalAccessException | InvocationTargetException | InstantiationException error) {
                 }
             }
         }
@@ -130,8 +127,7 @@ public class JsonConverter {
                             json.add(name, dateFormat.format(value));
                         }
                     }
-                } catch (IllegalAccessException error) {
-                } catch (InvocationTargetException error) {
+                } catch (IllegalAccessException | InvocationTargetException error) {
                 }
             }
         }