Fixed bug #587

3 files changed, 7 insertions, 6 deletions

diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index 9c90f5fdb10..01f6ebf6e68 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -351,7 +351,7 @@ public class Application extends EditableParent
 	super.commit();

 	_origVariables = _descriptor.variables;

 	_origDescription = _descriptor.description;

-	_origDistrib = _descriptor.distrib;

+	_origDistrib = (DistributionDescriptor)_descriptor.distrib.clone();

     }

 

     public Object getDescriptor()

@@ -440,7 +440,7 @@ public class Application extends EditableParent
 	_descriptor = descriptor;

 	_origVariables = _descriptor.variables;

 	_origDescription = _descriptor.description;

-	_origDistrib = _descriptor.distrib;

+	_origDistrib = (DistributionDescriptor)_descriptor.distrib.clone();

 

 	_resolver = new Utils.Resolver(_descriptor.variables);

 	_resolver.put("application", descriptor.name);

@@ -536,7 +536,7 @@ public class Application extends EditableParent
 	if(desc.distrib != null)

 	{

 	    _descriptor.distrib = desc.distrib.value;

-	    _origDistrib = _descriptor.distrib;

+	    _origDistrib = (DistributionDescriptor)_descriptor.distrib.clone();

 	}

 

 	//

diff --git a/java/src/IceGrid/TreeNode/ApplicationEditor.java b/java/src/IceGrid/TreeNode/ApplicationEditor.java
index 9eabcb7e26d..ff7e8ecc774 100755
--- a/java/src/IceGrid/TreeNode/ApplicationEditor.java
+++ b/java/src/IceGrid/TreeNode/ApplicationEditor.java
@@ -25,6 +25,7 @@ import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.CellConstraints;

 

 import IceGrid.ApplicationDescriptor;

+import IceGrid.DistributionDescriptor;

 import IceGrid.ListDialog;

 import IceGrid.Model;

 import IceGrid.TableDialog;

@@ -249,7 +250,7 @@ class ApplicationEditor extends Editor
 	descriptor.name = _name.getText();

 	descriptor.variables = _variablesMap;

 	descriptor.description = _description.getText();

-	

+

 	if(_distrib.getSelectedItem() == NO_DISTRIB)

 	{

 	    descriptor.distrib.icepatch = "";

@@ -366,7 +367,7 @@ class ApplicationEditor extends Editor
 		return "None selected";

 	    }

 	};

-    static private final String DEFAULT_DISTRIB = "${application}.IcePatch2";

+    static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server";

 

     private JTextField _name = new JTextField(20);

     private JTextArea _description = new JTextArea(3, 20);

diff --git a/java/src/IceGrid/TreeNode/ServerSubEditor.java b/java/src/IceGrid/TreeNode/ServerSubEditor.java
index 320680e6b90..2c3082a63d9 100755
--- a/java/src/IceGrid/TreeNode/ServerSubEditor.java
+++ b/java/src/IceGrid/TreeNode/ServerSubEditor.java
@@ -416,7 +416,7 @@ class ServerSubEditor extends CommunicatorSubEditor
 	    }

 	};

 

-    static private final String DEFAULT_DISTRIB = "${application}.IcePatch2";

+    static private final String DEFAULT_DISTRIB = "${application}.IcePatch2/server";

 

     private JTextField _id = new JTextField(20);

     private JTextField _exe = new JTextField(20);