You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2012/12/14 07:09:28 UTC
svn commit: r1421682 -
/karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java
Author: ffang
Date: Fri Dec 14 06:09:26 2012
New Revision: 1421682
URL: http://svn.apache.org/viewvc?rev=1421682&view=rev
Log:
[KARAF-2058]ensure find the root instance entry when update root karaf instance name in instances.properties
Modified:
karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java
Modified: karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java?rev=1421682&r1=1421681&r2=1421682&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java (original)
+++ karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java Fri Dec 14 06:09:26 2012
@@ -511,9 +511,15 @@ public class Main {
int count = Integer.parseInt(props.getProperty("count"));
// update root name if karaf.name got updated since the last container start
- String savedRootName = props.getProperty("item.0.name");
- if (savedRootName != null && isRoot && !savedRootName.equals(instanceName)) {
- props.setProperty("item.0.name", instanceName);
+ if (isRoot) {
+ for (int i = 0; i < count; i++) {
+ //looking for root instance entry
+ String name = props.getProperty("item." + i + ".name");
+ boolean root = Boolean.parseBoolean(props.getProperty("item." + i + ".root", "false"));
+ if (root && !name.equals(instanceName)) {
+ props.setProperty("item." + i + ".name", instanceName);
+ }
+ }
}
for (int i = 0; i < count; i++) {