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/23 14:17:26 UTC
svn commit: r1052260 -
/karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java
Author: gnodet
Date: Thu Dec 23 13:17:26 2010
New Revision: 1052260
URL: http://svn.apache.org/viewvc?rev=1052260&view=rev
Log:
[KARAF-334] Revert karaf-334 for now
Modified:
karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java
Modified: karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java?rev=1052260&r1=1052259&r2=1052260&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/branches/karaf-2.1.x/main/src/main/java/org/apache/karaf/main/Main.java Thu Dec 23 13:17:26 2010
@@ -538,7 +538,6 @@ public class Main {
for (Integer startLevel : autoStart.keySet()) {
StringTokenizer st = new StringTokenizer(autoStart.get(startLevel), "\" ", true);
if (st.countTokens() > 0) {
- List<Bundle> bundlesLevel = new ArrayList<Bundle>();
String location;
do {
location = nextLocation(st);
@@ -548,7 +547,6 @@ public class Main {
Bundle b = context.installBundle(parts[0], new URL(parts[1]).openStream());
sl.setBundleStartLevel(b, startLevel);
bundles.add(b);
- bundlesLevel.add(b);
}
catch (Exception ex) {
System.err.println("Error installing bundle " + location + ": " + ex);
@@ -556,20 +554,20 @@ public class Main {
}
}
while (location != null);
- // Now loop through and start the installed bundles.
- if (start) {
- for (Bundle b : bundlesLevel) {
- try {
- String fragmentHostHeader = (String) b.getHeaders().get(Constants.FRAGMENT_HOST);
- if (fragmentHostHeader == null || fragmentHostHeader.trim().length() == 0) {
- b.start();
- }
- }
- catch (Exception ex) {
- System.err.println("Error starting bundle " + b.getSymbolicName() + ": " + ex);
- }
+ }
+ }
+ // Now loop through and start the installed bundles.
+ if (start) {
+ for (Bundle b : bundles) {
+ try {
+ String fragmentHostHeader = (String) b.getHeaders().get(Constants.FRAGMENT_HOST);
+ if (fragmentHostHeader == null || fragmentHostHeader.trim().length() == 0) {
+ b.start();
}
}
+ catch (Exception ex) {
+ System.err.println("Error starting bundle " + b.getSymbolicName() + ": " + ex);
+ }
}
}
return bundles;