Commit 21eef022b567ad80e577916b79c663593bb1004e

Authored by 648540858
1 parent 407a5b77

修复级联点播

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java
@@ -385,7 +385,9 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor { @@ -385,7 +385,9 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
385 Response response = getMessageFactory().createResponse(statusCode, evt.getRequest()); 385 Response response = getMessageFactory().createResponse(statusCode, evt.getRequest());
386 ServerTransaction serverTransaction = getServerTransaction(evt); 386 ServerTransaction serverTransaction = getServerTransaction(evt);
387 serverTransaction.sendResponse(response); 387 serverTransaction.sendResponse(response);
388 - if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete(); 388 + if (statusCode >= 200) {
  389 + if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
  390 + }
389 } 391 }
390 392
391 private void responseAck(RequestEvent evt, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException { 393 private void responseAck(RequestEvent evt, int statusCode, String msg) throws SipException, InvalidArgumentException, ParseException {
@@ -393,7 +395,9 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor { @@ -393,7 +395,9 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
393 response.setReasonPhrase(msg); 395 response.setReasonPhrase(msg);
394 ServerTransaction serverTransaction = getServerTransaction(evt); 396 ServerTransaction serverTransaction = getServerTransaction(evt);
395 serverTransaction.sendResponse(response); 397 serverTransaction.sendResponse(response);
396 - if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete(); 398 + if (statusCode >= 200) {
  399 + if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
  400 + }
397 } 401 }
398 402
399 /** 403 /**
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
@@ -229,6 +229,7 @@ public class ZLMRTPServerFactory { @@ -229,6 +229,7 @@ public class ZLMRTPServerFactory {
229 */ 229 */
230 public int totalReaderCount(MediaServerItem mediaServerItem, String app, String streamId) { 230 public int totalReaderCount(MediaServerItem mediaServerItem, String app, String streamId) {
231 JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtmp", streamId); 231 JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo(mediaServerItem, app, "rtmp", streamId);
  232 + if (mediaInfo == null) return 0;
232 return mediaInfo.getInteger("totalReaderCount"); 233 return mediaInfo.getInteger("totalReaderCount");
233 } 234 }
234 235