From e01e54ee11e674acc6a69dfd595aebd84ba85e01 Mon Sep 17 00:00:00 2001 From: digitaldan Date: Sat, 10 Jan 2015 16:00:43 -0800 Subject: [PATCH] Fixed np check, log exceptions correctly --- .../openhab/io/rest/internal/filter/SendPageUpdateFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/filter/SendPageUpdateFilter.java b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/filter/SendPageUpdateFilter.java index 53636c7e0cb..e5335e25404 100644 --- a/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/filter/SendPageUpdateFilter.java +++ b/bundles/io/org.openhab.io.rest/src/main/java/org/openhab/io/rest/internal/filter/SendPageUpdateFilter.java @@ -63,7 +63,7 @@ public void run() { } catch (Exception e) { - logger.error(e.getMessage()); + logger.error("Could not broadcast messages",e); } } }); @@ -104,7 +104,7 @@ private boolean isPageUpdated(HttpServletRequest request, Object responseEntity) } CacheEntry entry = ResourceStateChangeListener.getCachedEntries().get(clientId); - if(entry ==null || entry.getData() instanceof PageBean){ + if(entry != null && entry.getData() instanceof PageBean){ Object firedEntity = entry.getData(); if( firedEntity == null || ((PageBean)firedEntity).icon != ((PageBean)responseEntity).icon || ((PageBean)firedEntity).title != ((PageBean)responseEntity).title ) { return true;