midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Carlos Ruiz 2023-07-29 16:40:33 +02:00 committed by GitHub
parent f689b0f630
commit f4561e64d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.idempiere.hazelcast.service/build.properties
View File

@ -5,7 +5,6 @@ bin.includes = META-INF/,\
OSGI-INF/cacheservice.xml,\ OSGI-INF/cacheservice.xml,\
OSGI-INF/messageservice.xml,\ OSGI-INF/messageservice.xml,\
OSGI-INF/,\ OSGI-INF/,\
lib/hazelcast-aws.jar,\
lib/hazelcast.jar lib/hazelcast.jar
source.. = src/ source.. = src/
jre.compilation.profile = JavaSE-17 jre.compilation.profile = JavaSE-17

5
org.idempiere.hazelcast.service/pom.xml
View File

@ -28,11 +28,6 @@
<artifactId>hazelcast</artifactId> <artifactId>hazelcast</artifactId>
<version>5.3.1</version> <version>5.3.1</version>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-aws</artifactId>
<version>3.4</version>
</artifactItem>
</artifactItems> </artifactItems>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
<stripVersion>true</stripVersion> <stripVersion>true</stripVersion>

2
org.idempiere.hazelcast.service/src/org/idempiere/hazelcast/service/Activator.java
View File

@ -133,7 +133,7 @@ public class Activator implements BundleActivator {
} }
Enumeration<URL> entries = getContext().getBundle().findEntries("/", "hazelcast.xml", false); 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) { if (url != null) {
try { try {
Config config = new UrlXmlConfig(url); Config config = new UrlXmlConfig(url);