This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5f61cf40b99f2f021ed7701754bb3c5f1636cf0c Author: reta <[email protected]> AuthorDate: Sun Dec 20 18:29:04 2020 -0500 CXF-8340: GraalVM native image fails to run. Minor fixes (cherry picked from commit 15185954d24578b3a848afe5bf258d9774ff03b6) --- .../main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java | 3 ++- .../main/java/org/apache/cxf/common/spi/GeneratedClassClassLoader.java | 2 +- distribution/src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +- .../src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java b/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java index f7cc719..442deb5 100644 --- a/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java +++ b/core/src/main/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java @@ -104,11 +104,12 @@ public class ClassGeneratorClassLoader { } public static class TypeHelperClassLoader extends ClassLoader { - ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<>(); + private final ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<>(); TypeHelperClassLoader(ClassLoader parent) { super(parent); } + public Class<?> lookupDefinedClass(String name) { return defined.get(StringUtils.slashesToPeriod(name)); } diff --git a/core/src/main/java/org/apache/cxf/common/spi/GeneratedClassClassLoader.java b/core/src/main/java/org/apache/cxf/common/spi/GeneratedClassClassLoader.java index 320ee52..7f3b2dd 100644 --- a/core/src/main/java/org/apache/cxf/common/spi/GeneratedClassClassLoader.java +++ b/core/src/main/java/org/apache/cxf/common/spi/GeneratedClassClassLoader.java @@ -69,7 +69,7 @@ public class GeneratedClassClassLoader { } public static class TypeHelperClassLoader extends ClassLoader { - ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<>(); + private final ConcurrentHashMap<String, Class<?>> defined = new ConcurrentHashMap<>(); TypeHelperClassLoader(ClassLoader parent) { super(parent); diff --git a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml index d0c4fe7..afb24fd 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm/pom.xml +++ b/distribution/src/main/release/samples/jaxws_graalvm/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>3.4.2-SNAPSHOT</version> </parent> <properties> <cxf.version>${project.version}</cxf.version> diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml index dbc0e75..0521b75 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml +++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>3.4.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <properties> diff --git a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml index 2ea725d..dc381dd 100644 --- a/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml +++ b/distribution/src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>3.4.2-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <properties>
