guzijian / wvp-GB28181-pro · Commits

Commit 292c36f1c1397e6ba3f621ac43f521ab884551f2

Authored by 648540858
Committed by GitHub
2 parents a5d9afeb 273b282a

Merge pull request #774 from gaoxun1937/wvp-28181-2.0 

防止查询录像回放记录为空时的空指针错误
Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
  View file @292c36f
... ... @@ -163,8 +163,9 @@ public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent
163 163 public void releaseRequest(String deviceId, String sn,RecordInfo recordInfo){
164 164 String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
165 165 // 对数据进行排序
166   - Collections.sort(recordInfo.getRecordList());
167   -
  166 + if(recordInfo!=null && recordInfo.getRecordList()!=null) {
  167 + Collections.sort(recordInfo.getRecordList());
  168 + }
168 169 RequestMessage msg = new RequestMessage();
169 170 msg.setKey(key);
170 171 msg.setData(recordInfo);
... ...