svn commit: r1646241 - in /sling/trunk/bundles/extensions/adapter/src: main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java test/java/org/apache/sling/adapter/internal/PackageNameTest.java

[bdelacretaz]

Author: bdelacretaz
Date: Wed Dec 17 13:54:27 2014
New Revision: 1646241

URL: http://svn.apache.org/r1646241
Log:
SLING-4255 - more robust getPackageName()

Modified:
    
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
    
sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/PackageNameTest.java

Modified: 
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java?rev=1646241&r1=1646240&r2=1646241&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
 Wed Dec 17 13:54:27 2014
@@ -309,7 +309,8 @@ public class AdapterManagerImpl implemen
     }
     
     static String getPackageName(String clazz) {
-        return clazz.substring(0, clazz.lastIndexOf('.'));
+        final int lastDot = clazz.lastIndexOf('.');
+        return lastDot <= 0 ? "" : clazz.substring(0, lastDot);
     }
 
     /**

Modified: 
sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/PackageNameTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/PackageNameTest.java?rev=1646241&r1=1646240&r2=1646241&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/PackageNameTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/PackageNameTest.java
 Wed Dec 17 13:54:27 2014
@@ -35,8 +35,8 @@ public class PackageNameTest {
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {   
                 { "java.lang.Foo", "java.lang" },
-                //{ "noPackageName", "" },
-                //{ "", "" }
+                { "noPackageName", "" },
+                { "", "" }
         });
     }