aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1795881 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
Date Tue, 23 May 2017 06:52:19 GMT
Author: cschneider
Date: Tue May 23 06:52:19 2017
New Revision: 1795881

URL: http://svn.apache.org/viewvc?rev=1795881&view=rev
Log:
ARIES-1720 - fixed NullPointerException. Closes #73

Modified:
    aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java?rev=1795881&r1=1795880&r2=1795881&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
(original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
Tue May 23 06:52:19 2017
@@ -455,7 +455,7 @@ public class RawSubsystemResource implem
 		for (IFile file : directory.listFiles()) {
             if (file.isFile()) {
                 addResource(file, file.convertNested(), manifest, result);
-            } else {
+            } else if (!file.getName().endsWith("OSGI-INF")) {
                 addResource(file, file.convert(), manifest, result);
             }
 		}



Mime
View raw message