Skip to content
This repository has been archived by the owner on May 17, 2021. It is now read-only.

Fixed np check, log exceptions correctly #1959

Merged
merged 1 commit into from
Jan 11, 2015
Merged

Fixed np check, log exceptions correctly #1959

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...enhab.io.rest/src/main/java/org/openhab/io/rest/internal/filter/SendPageUpdateFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void run() {


} catch (Exception e) {
logger.error(e.getMessage());
logger.error("Could not broadcast messages",e);
}
}
});
Expand Down Expand Up @@ -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;
Expand Down