From df11956c3c203434d3ef54955a502c466f1382dd Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 07 六月 2021 15:42:01 +0800
Subject: [PATCH] 取出错误配置

---
 src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
index d524fb0..6a1401d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
@@ -5,14 +5,19 @@
 import java.util.Random;
 
 import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @Description:SIP淇′护涓殑SSRC宸ュ叿绫汇�係SRC鍊肩敱10浣嶅崄杩涘埗鏁存暟缁勬垚鐨勫瓧绗︿覆锛岀涓�浣嶄负0浠h〃瀹炲喌锛屼负1鍒欎唬琛ㄥ洖鏀撅紱绗簩浣嶈嚦绗叚浣嶇敱鐩戞帶鍩烮D鐨勭4浣嶅埌绗�8浣嶇粍鎴愶紱鏈�鍚�4浣嶄负涓嶉噸澶嶇殑4涓暣鏁�
- * @author: songww
+ * @author: swwheihei
  * @date: 2020骞�5鏈�10鏃� 涓婂崍11:57:57
  */
 public class SsrcUtil {
+
+	private final static Logger logger = LoggerFactory.getLogger(SsrcUtil.class);
 
 	private static String ssrcPrefix;
 
@@ -59,6 +64,10 @@
 	 * 
 	 */
 	public static void releaseSsrc(String ssrc) {
+		if (ssrc == null) {
+			logger.error("瑕侀噴鏀緎src涓簄ull");
+			return;
+		}
 		String sn = ssrc.substring(6);
 		isUsed.remove(sn);
 		notUsed.add(sn);
@@ -70,14 +79,16 @@
 	 */
 	private static String getSN() {
 		String sn = null;
+		int index = 0;
 		if (notUsed.size() == 0) {
 			throw new RuntimeException("ssrc宸茬粡鐢ㄥ畬");
 		} else if (notUsed.size() == 1) {
 			sn = notUsed.get(0);
 		} else {
-			sn = notUsed.get(new Random().nextInt(notUsed.size() - 1));
+			index = new Random().nextInt(notUsed.size() - 1);
+			sn = notUsed.get(index);
 		}
-		notUsed.remove(0);
+		notUsed.remove(index);
 		isUsed.add(sn);
 		return sn;
 	}

--
Gitblit v1.8.0