Merge Java 7 update (fix #1273)

1 files changed, 2 insertions, 4 deletions

diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index 959602512..48f3228ce 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -50,7 +50,7 @@ public class DataManager implements IdentityManager {
     
     private DataSource dataSource;
     
-    private final Map<String, Device> devices = new HashMap<String, Device>();
+    private final Map<String, Device> devices = new HashMap<>();
     private long devicesLastUpdate;
     private final long devicesRefreshDelay;
 
@@ -200,9 +200,7 @@ public class DataManager implements IdentityManager {
                 
                 updateLatestPosition(position);
 
-            } catch (SQLException error) {
-                Log.warning(error);
-            } catch (ParseException error) {
+            } catch (SQLException | ParseException error) {
                 Log.warning(error);
             }
         }