1 files changed, 2 insertions, 15 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index f121c80d614..0194e2a35f7 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -855,29 +855,16 @@ ServerDescriptorHelper::ServerDescriptorHelper(const DescriptorHelper& helper, c
     }
 
     string interpreter = attributes("interpreter", "");
-    if(interpreter == "icebox")
-    {
-	_descriptor = new IceBoxDescriptor();
-	if(_descriptor->exe.empty())
-	{
-	    _descriptor->exe = "icebox";
-	}
-    }
-    else if(interpreter == "java-icebox")
+    if(interpreter == "icebox" || interpreter == "java-icebox")
     {
 	_descriptor = new IceBoxDescriptor();
-	_descriptor->interpreter = "java";
-	if(_descriptor->exe.empty())
-	{
-	    _descriptor->exe = "IceBox.Server";
-	}
     }
     else
     {
 	_descriptor = new ServerDescriptor();
 	_descriptor->exe = attributes("exe");
-	_descriptor->interpreter = interpreter;
     }
+    _descriptor->interpreter = interpreter;
 
     ComponentDescriptorHelper::init(_descriptor, attrs);