From f1592a199808bda8cec53d5ab8275c49a5fd96a4 Mon Sep 17 00:00:00 2001 From: Admin Date: Mon, 30 Jan 2017 15:57:35 -0600 Subject: [PATCH] Issue with not checking for null --- .../bwssystems/HABridge/dao/DeviceDescriptor.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java b/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java index 75b14cb..a727c26 100644 --- a/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java +++ b/src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java @@ -220,19 +220,22 @@ public class DeviceDescriptor{ } public boolean containsType(String aType) { - if(this.mapType.contains(aType)) + if(aType == null) + return false; + + if(this.mapType != null && this.mapType.contains(aType)) return true; - if(this.deviceType.contains(aType)) + if(this.deviceType != null && this.deviceType.contains(aType)) return true; - if(this.onUrl.contains(aType)) + if(this.onUrl != null && this.onUrl.contains(aType)) return true; - if(this.dimUrl.contains(aType)) + if(this.dimUrl != null && this.dimUrl.contains(aType)) return true; - if(this.offUrl.contains(aType)) + if(this.offUrl != null && this.offUrl.contains(aType)) return true; return false;