Little fix for issue #77 CallGap operation

RestComm · Feb 10, 2017 · 364f07a · 364f07a
1 parent b6cce6c
commit 364f07a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cap/CAPMessagesImplemented.ods b/cap/CAPMessagesImplemented.ods
diff --git a/cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/gap/BasicGapCriteriaImpl.java b/cap/cap-impl/src/main/java/org/mobicents/protocols/ss7/cap/gap/BasicGapCriteriaImpl.java
@@ -209,8 +209,16 @@ public void encodeAll(AsnOutputStream asnOs, int tagClass, int tag) throws CAPEx
 
     public void encodeData(AsnOutputStream asnOs) throws CAPException {
 
-        if ((this.calledAddressValue == null && this.gapOnService == null && this.calledAddressAndService == null && this.callingAddressAndService == null)
-                || (this.calledAddressValue != null && this.gapOnService != null || this.calledAddressAndService != null && this.callingAddressAndService != null)) {
+        int cnt = 0;
+        if (this.calledAddressValue != null)
+            cnt++;
+        if (this.gapOnService != null)
+            cnt++;
+        if (this.calledAddressAndService != null)
+            cnt++;
+        if (this.callingAddressAndService != null)
+            cnt++;
+        if (cnt != 1) {
             throw new CAPException("Error while encoding " + _PrimitiveName + ": One and only one choice must be selected");
         }