648540858
2022-01-28 8cfff8db97b7e51578424b6a202ae80cd56923a2
添加对可能空指针的判断
2个文件已修改
7 ■■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
@@ -225,6 +225,7 @@
    public Request createInfoRequest(Device device, StreamInfo streamInfo, String content, Long cseq)
            throws PeerUnavailableException, ParseException, InvalidArgumentException {
        Request request = null;
        if (streamInfo == null) return null;
        Dialog dialog = streamSession.getDialog(streamInfo.getDeviceID(), streamInfo.getChannelId());
        SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(),
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -1589,6 +1589,9 @@
            content.append("CSeq: " + cseq + "\r\n");
            content.append("PauseTime: now\r\n");
            Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
            if (request == null) {
                return;
            }
            logger.info(request.toString());
            ClientTransaction clientTransaction = null;
            if ("TCP".equals(device.getTransport())) {
@@ -1617,6 +1620,7 @@
            content.append("CSeq: " + cseq + "\r\n");
            content.append("Range: npt=now-\r\n");
            Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
            if (request == null) return;
            logger.info(request.toString());
            ClientTransaction clientTransaction = null;
            if ("TCP".equals(device.getTransport())) {
@@ -1645,6 +1649,7 @@
            content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
            Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
            if (request == null) return;
            logger.info(request.toString());
            ClientTransaction clientTransaction = null;
            if ("TCP".equals(device.getTransport())) {
@@ -1672,6 +1677,7 @@
            content.append("CSeq: " + cseq + "\r\n");
            content.append("Scale: " + String.format("%.1f",speed) + "\r\n");
            Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
            if (request == null) return;
            logger.info(request.toString());
            ClientTransaction clientTransaction = null;
            if ("TCP".equals(device.getTransport())) {