From b7c16fe6ed13a3ddc3f35a8caf2736f1536bad61 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 一月 2022 09:38:26 +0800
Subject: [PATCH] Merge pull request #311 from szy833/wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
index 12a50e1..5f0d14d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/online/OnlineEventListener.java
@@ -85,7 +85,7 @@
 
 		device.setOnline(1);
 		Device deviceInstore = storager.queryVideoDevice(device.getDeviceId());
-		if (deviceInstore.getOnline() == 0) {
+		if (deviceInstore != null && deviceInstore.getOnline() == 0) {
 			List<DeviceChannel> deviceChannelList = storager.queryOnlineChannelsByDeviceId(device.getDeviceId());
 			eventPublisher.catalogEventPublish(null, deviceChannelList, CatalogEvent.ON);
 		}

--
Gitblit v1.8.0