Commit 3dc1e0368e63a40131afb10ab0c7e26f651d220b

Authored by 648540858
1 parent ee746e53

修复合并分支造成的bug

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
... ... @@ -364,8 +364,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
364 364 }
365 365  
366 366 // 写入redis, 超时时回复
367   - redisCatchStorage.updateSendRTPSever(sendRtpItem);
368   -
369 367 sendRtpItem.setStatus(1);
370 368 redisCatchStorage.updateSendRTPSever(sendRtpItem);
371 369 StringBuffer content = new StringBuffer(200);
... ...
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
... ... @@ -117,7 +117,7 @@ public class PlayServiceImpl implements IPlayService {
117 117 // 点播超时回复BYE
118 118 cmder.streamByeCmd(device.getDeviceId(), channelId, streamInfo.getStream());
119 119 // 释放rtpserver
120   - mediaServerService.closeRTPServer(playResult.getDevice(), channelId, streamInfo.getStream());
  120 + mediaServerService.closeRTPServer(playResult.getDevice().getDeviceId(), channelId, streamInfo.getStream());
121 121 // 回复之前所有的点播请求
122 122 resultHolder.invokeAllResult(msg);
123 123 // TODO 释放ssrc
... ...