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/11/01 06:31:58 UTC
svn commit: r1404467 -
/karaf/branches/karaf-2.2.x/main/src/main/java/org/apache/karaf/main/Main.java
Author: ffang
Date: Thu Nov 1 05:31:57 2012
New Revision: 1404467
URL: http://svn.apache.org/viewvc?rev=1404467&view=rev
Log:
[KARAF-1986]instance.properties file doesn't get updated if karaf.name is changed
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=1404467&r1=1404466&r2=1404467&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 Thu Nov 1 05:31:57 2012
@@ -509,6 +509,13 @@ public class Main {
FileInputStream fis = new FileInputStream(propertiesFile);
props.load(fis);
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);
+ }
+
for (int i = 0; i < count; i++) {
String name = props.getProperty("item." + i + ".name");
if (name.equals(instanceName)) {