Fix for RestComm#339

horacimacias · Sep 12, 2017 · a42001c · a42001c
1 parent 1465420
commit a42001c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java b/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
@@ -206,7 +206,7 @@ public void cancel(String[] protocol, int[] reasonCode, String[] reasonText) {
 					if(logger.isDebugEnabled()) {
 						logger.debug("Trying to cancel ProxyBranch for outgoing request " + outgoingRequest);
 					}
-					if(lastResponse.getStatus() > Response.OK && !recursedBranches.isEmpty()) {
+					if(lastResponse.getStatus() > Response.OK && recursedBranches != null && !recursedBranches.isEmpty()) {
 						//  Javadoc says it should throw an java.lang.IllegalStateException if the transaction has already been completed and it has no child branches
 						if(logger.isDebugEnabled()) {
 							logger.debug("lastResponse status for this branch is " + lastResponse.getStatus() + " and it has " + recursedBranches.size() + " to cancel");