fix(java): CodeGen: Name conflicts when omitting java.lang prefix #1363…

… - resolved an issue when pkg is null
apache · Feb 6, 2024 · ab77ee2 · ab77ee2
1 parent 1996b4d
commit ab77ee2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java b/java/fury-core/src/main/java/org/apache/fury/codegen/CodegenContext.java
@@ -289,8 +289,9 @@ public String type(Class<?> clz) {
     if (type.startsWith("java.lang")) {
       if (!type.substring("java.lang.".length()).contains(".")) {
         String simpleName = clz.getSimpleName();
+        boolean hasPackage = StringUtils.isNotBlank(pkg);
         Map<String, Boolean> packageMap =
-            nameConflicts.computeIfAbsent(pkg, p -> new ConcurrentHashMap<>());
+            nameConflicts.computeIfAbsent(hasPackage ? pkg : "", p -> new ConcurrentHashMap<>());
         Boolean conflictRes =
             packageMap.computeIfAbsent(
                 simpleName,
@@ -300,7 +301,7 @@ public String type(Class<?> clz) {
                         clz.getClassLoader() == null
                             ? Thread.currentThread().getContextClassLoader()
                             : clz.getClassLoader();
-                    beanClassClassLoader.loadClass(pkg + "." + sn);
+                    beanClassClassLoader.loadClass(hasPackage ? pkg + "." + sn : sn);
                     return Boolean.TRUE;
                   } catch (ClassNotFoundException e) {
                     return Boolean.FALSE;