aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-07-13 22:48:51 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-07-13 22:48:51 +1200
commitd155b8e65f88eba52807667358e8ed4aa3292f9f (patch)
tree117faca7558c154fc45faf17e63b55d6dd27a4bd /src/org/traccar/http
parent3eec82b5db78e8b9418230a368138fb7b14d4b3b (diff)
downloadtraccar-server-d155b8e65f88eba52807667358e8ed4aa3292f9f.tar.gz
traccar-server-d155b8e65f88eba52807667358e8ed4aa3292f9f.tar.bz2
traccar-server-d155b8e65f88eba52807667358e8ed4aa3292f9f.zip
Catch multiple exception types
Diffstat (limited to 'src/org/traccar/http')
-rw-r--r--src/org/traccar/http/JsonConverter.java8
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) {
}
}
}