Fix issue with OSGi when having package name starting with "class" (e…

…clipse-ee4j#4235) Signed-off-by: Jan Supol <[email protected]>
pa314159 · Sep 3, 2019 · ec0abb4 · ec0abb4
1 parent 33ebc2c
commit ec0abb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core-common/src/main/java/org/glassfish/jersey/internal/OsgiRegistry.java b/core-common/src/main/java/org/glassfish/jersey/internal/OsgiRegistry.java
@@ -307,7 +307,7 @@ public static String bundleEntryPathToClassName(String packagePath, String bundl
                 : packagePath + bundleEntryPath.substring(bundleEntryPath.lastIndexOf('/') + 1);
 
         return (normalizedClassNamePath.startsWith("/") ? normalizedClassNamePath.substring(1) : normalizedClassNamePath)
-                .replace('/', '.').replace(".class", "");
+                .replace(".class", "").replace('/', '.');
     }
 
     /**

diff --git a/core-common/src/test/java/org/glassfish/jersey/internal/util/OsgiRegistryTest.java b/core-common/src/test/java/org/glassfish/jersey/internal/util/OsgiRegistryTest.java
@@ -112,6 +112,12 @@ public void testRootWebInfClassesBundleEntryPathTranslationNoLeadingSlash() {
         Assert.assertEquals("org.glassfish.jersey.Test", className);
     }
 
+    @Test
+    public void testDotClassInPackageName() {
+        String className = OsgiRegistry.bundleEntryPathToClassName("/", "com/classification/Test");
+        Assert.assertEquals("com.classification.Test", className);
+    }
+
     @Test
     public void testRootWebInfClassesBundleEntryPathEsTranslation() {
         String className = OsgiRegistry.bundleEntryPathToClassName("es", "/WEB-INF/classes/es/a/Test.class");