Merge "allow EpPolicyTemplate without conditions"

diff --git a/sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/dao/EpPolicyTemplateValueKeyFactory.java b/sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/dao/EpPolicyTemplateValueKeyFactory.java
index 4f757f7df00c12fbeb43a0e21f30a88a7fc362d6..5bbac19ec07c1cabfe153613ea3f48d8450f1561 100644 (file)
--- a/sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/dao/EpPolicyTemplateValueKeyFactory.java
+++ b/sxp-mapper/src/main/java/org/opendaylight/groupbasedpolicy/sxp/mapper/impl/dao/EpPolicyTemplateValueKeyFactory.java
@@ -46,7 +46,9 @@ public class EpPolicyTemplateValueKeyFactory {
 
     public EpPolicyTemplateValueKey sortValueKeyLists(final EpPolicyTemplateValueKey existingKey) {
         Collections.sort(existingKey.getEpgId(), epgIdOrdering);
-        Collections.sort(existingKey.getConditionName(), conditionOrdering);
+        if (existingKey.getConditionName() != null) {
+            Collections.sort(existingKey.getConditionName(), conditionOrdering);
+        }
         return existingKey;
     }