prevent NPE when setting derived dialog

jaimecasero · jaimecasero · commit 5c4c4abf0dba · 2018-05-28T19:11:51.000+02:00
diff --git a/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java b/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
@@ -700,7 +700,7 @@ public SipServletResponse createResponseToOriginalRequest(
         //do this before creating response so proper toTag is selected
         SIPTransaction tx = (SIPTransaction) sipServletRequestImpl.getTransaction();
         SIPDialog newDialog = (SIPDialog)sipSession.getSessionCreatingDialog();
-        if (newDialog != null) {
+        if (newDialog != null && tx != null) {
             logger.debug("recovering dialog on transaction before send:" + System.identityHashCode(newDialog));
             tx.setDialog(newDialog, newDialog.getDialogId());
         }

Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ public SipServletResponse createResponseToOriginalRequest(`
`700`	`700`	`//do this before creating response so proper toTag is selected`
`701`	`701`	`SIPTransaction tx = (SIPTransaction) sipServletRequestImpl.getTransaction();`
`702`	`702`	`SIPDialog newDialog = (SIPDialog)sipSession.getSessionCreatingDialog();`
`703`		`- if (newDialog != null) {`
	`703`	`+ if (newDialog != null && tx != null) {`
`704`	`704`	`logger.debug("recovering dialog on transaction before send:" + System.identityHashCode(newDialog));`
`705`	`705`	`tx.setDialog(newDialog, newDialog.getDialogId());`
`706`	`706`	`}`