Final fix for resolving room mapping. Also applied this fix to category

mappign in SDATA as well.
bwssytems · Aug 27, 2015 · 937fb5d · 937fb5d
1 parent bd60d63
commit 937fb5d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/com/bwssystems/vera/VeraInfo.java b/src/main/java/com/bwssystems/vera/VeraInfo.java
@@ -57,11 +57,11 @@ private void denormalizeSdata(Sdata theSdata) {
 		Device theDevice = null;
 		while (theIterator.hasNext()) {
 			theDevice = theIterator.next();
-			if(theDevice.getRoom() != null)
+			if(theDevice.getRoom() != null && roomMap.get(theDevice.getRoom()) != null)
 				theDevice.setRoom(roomMap.get(theDevice.getRoom()).getName());
 			else
-				theDevice.setRoom("<unknown>");
-			if(theDevice.getCategory() != null)
+				theDevice.setRoom("no room");
+			if(theDevice.getCategory() != null && categoryMap.get(theDevice.getCategory()) != null)
 				theDevice.setCategory(categoryMap.get(theDevice.getCategory()).getName());
 			else
 				theDevice.setCategory("<unknown>");