From: Matej Perina <matej.perina@pantheon.sk>
Date: Thu, 30 Jun 2016 08:53:02 +0000 (+0200)
Subject: allow EpPolicyTemplate without conditions
X-Git-Tag: release/boron~76^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7c7d4738ec2acf61a2fe22ae39c3b4fcf782e90e;p=groupbasedpolicy.git

allow EpPolicyTemplate without conditions


Change-Id: Id659d39e110cf217bcef0d224ebc4d75708273f4
Signed-off-by: Matej Perina <matej.perina@pantheon.sk>
---

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 4f757f7df..5bbac19ec 100644
--- 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;
     }