修复合并的bug

648540858
1 parent 6c9d6f00
Showing 2 changed files with 2 additions and 4 deletions
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestProcessor.java
@@ -236,8 +236,8 @@ public class StreamInfo implements Serializable, Cloneable{
         }
     }
-    public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam) {
-        String file = String.format("index/api/webrtc?app=%s&stream=%s&type=play%s", app, stream, callIdParam);
+    public void setRtc(String host, int port, int sslPort, String app, String stream, String callIdParam, boolean isPlay) {
+        String file = String.format("index/api/webrtc?app=%s&stream=%s&type=%s%s", app, stream, isPlay?"play":"push", callIdParam);
         if (port > 0) {
             this.rtc = new StreamURL("http", host, port, file);
         }
@@ -127,8 +127,6 @@ public class NotifyRequestProcessor extends SIPRequestProcessorParent implements
 					}
 				}catch (Exception e) {
 					logger.error("处理NOTIFY消息时错误", e);
-				}finally {
-					taskQueueHandlerRun = false;
 				}
 			});
 		}