From 7d3cbb8253ec3dc7f4004ae67371f852727909df Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 七月 2023 09:42:32 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev

---
 src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
index 60f5cf6..541c111 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
@@ -244,6 +244,9 @@
 	}
 
 	public Integer getStreamModeForParam() {
+		if (streamMode == null) {
+			return 0;
+		}
 		if (streamMode.equalsIgnoreCase("UDP")) {
 			return 0;
 		}else if (streamMode.equalsIgnoreCase("TCP-PASSIVE")) {

--
Gitblit v1.8.0