From f4561e64d7b305c424beb8d2e72d4ea8cc4f9e93 Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Sat, 29 Jul 2023 16:40:33 +0200
Subject: [PATCH] IDEMPIERE-5816 Upgrade Hazelcast version (FHCA-4436) (#1957)

- fix NPE when no hazelcast.xml file is in path or in bundle
- remove the library hazelcast-aws.jar - not needed anymore
---
 org.idempiere.hazelcast.service/build.properties             | 1 -
 org.idempiere.hazelcast.service/pom.xml                      | 5 -----
 .../src/org/idempiere/hazelcast/service/Activator.java       | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/org.idempiere.hazelcast.service/build.properties b/org.idempiere.hazelcast.service/build.properties
index 71616e54f4..17aa109a81 100644
--- a/org.idempiere.hazelcast.service/build.properties
+++ b/org.idempiere.hazelcast.service/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                OSGI-INF/cacheservice.xml,\
                OSGI-INF/messageservice.xml,\
                OSGI-INF/,\
-               lib/hazelcast-aws.jar,\
                lib/hazelcast.jar
 source.. = src/
 jre.compilation.profile = JavaSE-17
diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml
index 0a601294dc..457d9c0e3d 100644
--- a/org.idempiere.hazelcast.service/pom.xml
+++ b/org.idempiere.hazelcast.service/pom.xml
@@ -28,11 +28,6 @@
 									<artifactId>hazelcast</artifactId>
 									<version>5.3.1</version>
 								</artifactItem>
-								<artifactItem>
-									<groupId>com.hazelcast</groupId>
-									<artifactId>hazelcast-aws</artifactId>
-									<version>3.4</version>
-								</artifactItem>
 							</artifactItems>
 							<outputDirectory>lib</outputDirectory>
 							<stripVersion>true</stripVersion>
diff --git a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/Activator.java b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/Activator.java
index efa199a0f9..e6260b8e24 100644
--- a/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/Activator.java
+++ b/org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/Activator.java
@@ -133,7 +133,7 @@ public class Activator implements BundleActivator {
 			}
 			
 			Enumeration<URL> entries = getContext().getBundle().findEntries("/", "hazelcast.xml", false);
-			URL url = entries.hasMoreElements() ? entries.nextElement() : null;
+			URL url = (entries != null && entries.hasMoreElements()) ? entries.nextElement() : null;
 			if (url != null) {
 				try {
 					Config config = new UrlXmlConfig(url);