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

Fixed requester filter for multiple echos. Started MQTT MEssage screen.

Browse Source
This commit is contained in:
Admin
2016-11-14 16:43:33 -06:00
parent 3eba9b9245
commit 90f2bce282
4 changed files with 162 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/bwssystems/HABridge/dao/DeviceRepository.java
View File

@@ -101,13 +101,15 @@ public class DeviceRepository extends BackupHandler {
theDevice = anIterator.next();
theRequesterAddress = theDevice.getRequesterAddress();
addressMap = new HashMap<String, String>();
if (theRequesterAddress.contains(",")) {
String[] theArray = theRequesterAddress.split(",");
for (String v : theArray) {
addressMap.put(v, v);
}
} else
addressMap.put(theRequesterAddress, theRequesterAddress);
if(theRequesterAddress != null) {
if (theRequesterAddress.contains(",")) {
String[] theArray = theRequesterAddress.split(",");
for (String v : theArray) {
addressMap.put(v.trim(), v.trim());
}
} else
addressMap.put(theRequesterAddress, theRequesterAddress);
}
if (theRequesterAddress == null || theRequesterAddress.length() == 0 || addressMap.containsKey(anAddress))
theReturnList.add(theDevice);
}

2
src/main/java/com/bwssystems/mqtt/MQTTHome.java
View File

@@ -31,7 +31,7 @@ public class MQTTHome {
public void shutdownMQTTClients() {
log.debug("Shutting down MQTT handlers.");
if(!handlers.isEmpty()) {
if(handlers != null && !handlers.isEmpty()) {
Iterator<String> keys = handlers.keySet().iterator();
while(keys.hasNext()) {
String key = keys.next();