Skip to content

Commit 19d4ee1

Browse files
committed
Do not include empty directories as packages
1 parent 8d757d3 commit 19d4ee1

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

atomos/src/main/java/org/apache/felix/atomos/impl/base/AtomosBase.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,9 +1663,11 @@ void addPackages(Bundle b)
16631663
try
16641664
{
16651665
content.getEntries().forEach((s) -> {
1666-
if (s.length() > 1 && s.endsWith("/") && s.indexOf('-') < 0)
1666+
int sLen = s.length();
1667+
int lastSlash = s.lastIndexOf('/');
1668+
if (sLen > 1 && s.indexOf('-') < 0 && lastSlash > 0 && lastSlash != sLen - 1)
16671669
{
1668-
String pkg = s.substring(0, s.length() - 1).replace('/', '.');
1670+
String pkg = s.substring(0, lastSlash).replace('/', '.');
16691671
packageToAtomosContent.put(pkg,
16701672
(AtomosContentIndexed) atomosContent);
16711673
}

0 commit comments

Comments
 (0)