修复空指针异常

panlinlin

2020-12-27 6968839f21fb05bf6e3204c2040ee47130006cd0

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java

@@ -72,7 +72,7 @@


      request = sipFactory.createMessageFactory().createRequest(requestURI, Request.MESSAGE, callIdHeader, cSeqHeader, fromHeader,

            toHeader, viaHeaders, maxForwards);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "MANSCDP+xml");

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "MANSCDP+xml");

      request.setContent(content, contentTypeHeader);

      return request;

   }

@@ -84,10 +84,10 @@
      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(channelId, host.getAddress());

      //via

      ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();

      // ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getHost().getIp(), device.getHost().getPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);



      //from

      SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(),sipConfig.getSipDomain());

      Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI);

@@ -119,7 +119,7 @@
      // Subject

      SubjectHeader subjectHeader = sipFactory.createHeaderFactory().createSubjectHeader(String.format("%s:%s,%s:%s", channelId, ssrc, sipConfig.getSipId(), 0));

      request.addHeader(subjectHeader);

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "SDP");

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");

      request.setContent(content, contentTypeHeader);

      return request;

   }

@@ -129,9 +129,8 @@
      Host host = device.getHost();

      //请求行

      SipURI requestLine = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), host.getAddress());

      //via

      // via

      ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();

      // ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);

      ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(device.getHost().getIp(), device.getHost().getPort(), device.getTransport(), viaTag);

      viaHeader.setRPort();

      viaHeaders.add(viaHeader);

@@ -164,7 +163,7 @@
      // Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory().createSipURI(sipConfig.getSipId(), device.getHost().getIp()+":"+device.getHost().getPort()));

      request.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress));

      

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("Application", "SDP");

      ContentTypeHeader contentTypeHeader = sipFactory.createHeaderFactory().createContentTypeHeader("APPLICATION", "SDP");

      request.setContent(content, contentTypeHeader);

      return request;

   }