You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/12/20 16:52:56 UTC
svn commit: r1051153 - in /karaf/trunk/main/src:
main/java/org/apache/karaf/main/Main.java
test/resources/test-karaf-home/lib/foo
Author: gnodet
Date: Mon Dec 20 15:52:56 2010
New Revision: 1051153
URL: http://svn.apache.org/viewvc?rev=1051153&view=rev
Log:
[KARAF-335] The lib folder should be optional
Removed:
karaf/trunk/main/src/test/resources/test-karaf-home/lib/foo
Modified:
karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
Modified: karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java?rev=1051153&r1=1051152&r2=1051153&view=diff
==============================================================================
--- karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/trunk/main/src/main/java/org/apache/karaf/main/Main.java Mon Dec 20 15:52:56 2010
@@ -913,9 +913,12 @@ public class Main {
List<URL> urls = new ArrayList<URL>();
urls.add( bundleFile.toURI().toURL() );
- for (File f : new File(karafHome, "lib").listFiles()) {
- if (f.isFile() && f.canRead() && f.getName().endsWith(".jar")) {
- urls.add(f.toURI().toURL());
+ File[] libs = new File(karafHome, "lib").listFiles();
+ if (libs != null) {
+ for (File f : libs) {
+ if (f.isFile() && f.canRead() && f.getName().endsWith(".jar")) {
+ urls.add(f.toURI().toURL());
+ }
}
}