From 52a2cb207f6db0ecb374d80b820890ed697f17a1 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Mon, 3 Dec 2018 19:19:39 +0100
Subject: [PATCH] fixed creating new event or sensor from autodetect

---
 src/se/hal/page/EventConfigHttpPage.java  | 4 +++-
 src/se/hal/page/SensorConfigHttpPage.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java
index 56a34582..f3bf518d 100755
--- a/src/se/hal/page/EventConfigHttpPage.java
+++ b/src/se/hal/page/EventConfigHttpPage.java
@@ -9,6 +9,7 @@ import se.hal.page.HalAlertManager.HalAlert;
 import se.hal.struct.ClassConfigurationData;
 import se.hal.struct.Event;
 import se.hal.struct.User;
+import zutil.ObjectUtil;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
@@ -43,8 +44,9 @@ public class EventConfigHttpPage extends HalHttpPage {
 
         // Save new input
         if(request.containsKey("action")){
-            int id = (request.containsKey("id") ? Integer.parseInt(request.get("id")) : -1);
+            int id = (!ObjectUtil.isEmpty(request.get("id")) ? Integer.parseInt(request.get("id")) : -1);
             Event event;
+
             switch(request.get("action")) {
                 // Local events
                 case "create_local_event":
diff --git a/src/se/hal/page/SensorConfigHttpPage.java b/src/se/hal/page/SensorConfigHttpPage.java
index c55572f4..66732d7c 100755
--- a/src/se/hal/page/SensorConfigHttpPage.java
+++ b/src/se/hal/page/SensorConfigHttpPage.java
@@ -9,6 +9,7 @@ import se.hal.page.HalAlertManager.HalAlert;
 import se.hal.struct.ClassConfigurationData;
 import se.hal.struct.Sensor;
 import se.hal.struct.User;
+import zutil.ObjectUtil;
 import zutil.db.DBConnection;
 import zutil.io.file.FileUtil;
 import zutil.parser.Templator;
@@ -43,9 +44,10 @@ public class SensorConfigHttpPage extends HalHttpPage {
 
         // Save new input
         if(request.containsKey("action")){
-            int id = (request.containsKey("id") ? Integer.parseInt(request.get("id")) : -1);
+            int id = (!ObjectUtil.isEmpty(request.get("id")) ? Integer.parseInt(request.get("id")) : -1);
             Sensor sensor;
             User user;
+
             switch(request.get("action")) {
                 // Local Sensors
                 case "create_local_sensor":