From 437f67407aece6f7aed8e989638b0d64075f0c0a Mon Sep 17 00:00:00 2001 From: Aijana Schumann Date: Wed, 4 Aug 2021 11:59:18 +0200 Subject: Update ODLUX Add various updates and bugfixes to NetworkMap, Configuration, LinkCalculation and ConnectApp Issue-ID: CCSDK-3414 Signed-off-by: Aijana Schumann Change-Id: I6ea5c3a9d6ccbe9c450da43220654a53fd2f262b Signed-off-by: Aijana Schumann --- sdnr/wt/odlux/core/model/pom.xml | 2 ++ .../src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'sdnr/wt/odlux/core/model') diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml index faec06761..c16705f58 100644 --- a/sdnr/wt/odlux/core/model/pom.xml +++ b/sdnr/wt/odlux/core/model/pom.xml @@ -58,5 +58,7 @@ org.osgi.compendium provided + + diff --git a/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java b/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java index bbe36c840..636c9db29 100644 --- a/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java +++ b/sdnr/wt/odlux/core/model/src/main/java/com/opensymphony/xwork2/util/ClassLoaderUtil.java @@ -203,7 +203,7 @@ public class ClassLoaderUtil { private Enumeration determineCurrentEnumeration() { if (cur != null && !cur.hasMoreElements()) { - if (!enums.isEmpty()) { + if (enums.size() > 0) { cur = enums.removeLast(); } else { cur = null; -- cgit 1.2.3-korg