From 62f5b3dfdd6352a9ecf1f87c600cacd48da04693 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 26 四月 2022 17:18:45 +0800
Subject: [PATCH] Merge pull request #452 from hotcoffie/wvp-28181-2.0

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

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
index 3da7217..6ae09bd 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java
@@ -212,7 +212,7 @@
         }
         deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));
         String parentId = XmlUtil.getText(itemDevice, "ParentID");
-        if (parentId.contains("/")) {
+        if (parentId != null && parentId.contains("/")) {
             String lastParentId = parentId.substring(parentId.lastIndexOf("/") + 1);
             deviceChannel.setParentId(lastParentId);
         }else {

--
Gitblit v1.8.0