fix(hardware): manage exceptions

glpi-project · Jan 18, 2018 · a6097d9 · a6097d9
1 parent 3056820
commit a6097d9
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/inventory/src/main/java/org/flyve/inventory/categories/Hardware.java b/inventory/src/main/java/org/flyve/inventory/categories/Hardware.java
@@ -104,28 +104,29 @@ public Hardware(Context xCtx) {
         super(xCtx);
 
         this.xCtx = xCtx;
-        props = System.getProperties();
-        Memory memory = new Memory(xCtx);
 
-        Category c = new Category("HARDWARE", "hardware");
+        try {
+            props = System.getProperties();
+            Memory memory = new Memory(xCtx);
 
-        c.put("DATELASTLOGGEDUSER", new CategoryValue(getDatelastloggeduser(), "DATELASTLOGGEDUSER", "dateLastLoggedUser") );
-        c.put("LASTLOGGEDUSER", new CategoryValue(getLastloggeduser(), "LASTLOGGEDUSER", "lastLoggedUser"));
-        c.put("NAME", new CategoryValue(getName(), "NAME", "name"));
-        c.put("OSNAME", new CategoryValue(OSNAME, "OSNAME", "osName"));
-        c.put("OSVERSION", new CategoryValue(getOsversion(), "OSVERSION", "osVersion"));
-        c.put("ARCHNAME", new CategoryValue(getArchname(), "ARCHNAME", "archName"));
-        c.put("UUID", new CategoryValue(getUUID(), "UUID", "uuid"));
+            Category c = new Category("HARDWARE", "hardware");
 
-        String vMemory = "";
-        try {
-            vMemory = memory.getCapacity();
+            c.put("DATELASTLOGGEDUSER", new CategoryValue(getDatelastloggeduser(), "DATELASTLOGGEDUSER", "dateLastLoggedUser"));
+            c.put("LASTLOGGEDUSER", new CategoryValue(getLastloggeduser(), "LASTLOGGEDUSER", "lastLoggedUser"));
+            c.put("NAME", new CategoryValue(getName(), "NAME", "name"));
+            c.put("OSNAME", new CategoryValue(OSNAME, "OSNAME", "osName"));
+            c.put("OSVERSION", new CategoryValue(getOsversion(), "OSVERSION", "osVersion"));
+            c.put("ARCHNAME", new CategoryValue(getArchname(), "ARCHNAME", "archName"));
+            c.put("UUID", new CategoryValue(getUUID(), "UUID", "uuid"));
+
+            String vMemory = memory.getCapacity();
+
+            c.put("MEMORY", new CategoryValue(vMemory, "MEMORY", "memory"));
+
+            this.add(c);
         } catch (Exception ex) {
             FILog.e(ex.getMessage());
         }
-        c.put("MEMORY", new CategoryValue(vMemory, "MEMORY", "memory"));
-
-        this.add(c);
 
     }