mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-19 00:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue with not checking for null

Browse Source
This commit is contained in:
Admin
2017-01-30 15:57:35 -06:00
parent 24dd427fb4
commit f1592a1998
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java
View File

@@ -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;