From dc72ff1334d211affda45589a2609d16e3165f7c Mon Sep 17 00:00:00 2001
From: Anatoly Satanovskiy <anatoly.satanovskiy@mobius-software.com>
Date: Wed, 20 Sep 2017 13:11:40 +0300
Subject: [PATCH] added npe check for activityflags

---
 .../mobicents/slee/runtime/activity/ActivityContextImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container/activities/src/main/java/org/mobicents/slee/runtime/activity/ActivityContextImpl.java b/container/activities/src/main/java/org/mobicents/slee/runtime/activity/ActivityContextImpl.java
index f49d8e208a..dc75430ed7 100755
--- a/container/activities/src/main/java/org/mobicents/slee/runtime/activity/ActivityContextImpl.java
+++ b/container/activities/src/main/java/org/mobicents/slee/runtime/activity/ActivityContextImpl.java
@@ -163,7 +163,7 @@ public int getActivityFlags() {
 						.getObject(NODE_MAP_KEY_ACTIVITY_FLAGS);
 			}
 		}
-		return flags;
+		return flags != null ? flags : ActivityFlags.NO_FLAGS;
 	}
 
 	/**