From 7c7d4738ec2acf61a2fe22ae39c3b4fcf782e90e Mon Sep 17 00:00:00 2001 From: Matej Perina Date: Thu, 30 Jun 2016 10:53:02 +0200 Subject: [PATCH] allow EpPolicyTemplate without conditions Change-Id: Id659d39e110cf217bcef0d224ebc4d75708273f4 Signed-off-by: Matej Perina --- .../sxp/mapper/impl/dao/EpPolicyTemplateValueKeyFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- 2.36.6