svn commit: r1360554 - /karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java

[jb...@apache.org]

Author: jbonofre
Date: Thu Jul 12 07:11:19 2012
New Revision: 1360554

URL: http://svn.apache.org/viewvc?rev=1360554&view=rev
Log:
[KARAF-1566] Fix instance clone operation

Modified:
    karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java

Modified: karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java?rev=1360554&r1=1360553&r2=1360554&view=diff
==============================================================================
--- karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java (original)
+++ karaf/trunk/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java Thu Jul 12 07:11:19 2012
@@ -334,7 +334,7 @@ public class InstanceServiceImpl impleme
         logInfo("Cloning instance %s into %s", printOutput, name, cloneName);
         
         // define the clone instance location
-        String cloneLocationPath = settings.getLocation() != null ? settings.getLocation() : name;
+        String cloneLocationPath = settings.getLocation() != null ? settings.getLocation() : cloneName;
         File cloneLocation = new File(cloneLocationPath);
         if (!cloneLocation.isAbsolute()) {
             cloneLocation = new File(storageLocation, cloneLocationPath);
@@ -354,7 +354,7 @@ public class InstanceServiceImpl impleme
         if (settings.getRmiServerPort() > 0)
             props.put(new Integer(instance.getRmiServerPort()).toString(), new Integer(settings.getRmiServerPort()).toString());
         // filtering clone files
-        filterResource(cloneLocation, "etc/customer.properties", props);
+        filterResource(cloneLocation, "etc/custom.properties", props);
         filterResource(cloneLocation, "etc/org.apache.karaf.management.cfg", props);
         filterResource(cloneLocation, "etc/org.apache.karaf.shell.cfg", props);
         filterResource(cloneLocation, "etc/org.ops4j.pax.logging.cfg", props);
@@ -370,8 +370,8 @@ public class InstanceServiceImpl impleme
         if (javaOpts == null || javaOpts.length() == 0) {
             javaOpts = "-server -Xmx512M -Dcom.sun.management.jmxremote";
         }
-        Instance cloneInstance = new InstanceImpl(this, name, cloneLocation.toString(), settings.getJavaOpts());
-        instances.put(name, instance);
+        Instance cloneInstance = new InstanceImpl(this, cloneName, cloneLocation.toString(), settings.getJavaOpts());
+        instances.put(cloneName, cloneInstance);
         saveState();
         return cloneInstance;
     }