[246156] Select new runtime after creation

1 files changed, 11 insertions, 3 deletions

diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
index 6372668c6..75101a57e 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
@@ -234,8 +234,7 @@ public class NewManualServerComposite extends Composite {
 		addRuntime.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				IServerType serverType = serverTypeComposite.getSelectedServerType();
-				if (showRuntimeWizard(serverType) != Window.CANCEL)
-					updateRuntimeCombo(serverType);
+				showRuntimeWizard(serverType);
 			}
 		});
 		
@@ -287,7 +286,16 @@ public class NewManualServerComposite extends Composite {
 		TaskWizard wizard2 = new TaskWizard(Messages.wizNewRuntimeWizardTitle, fragment, taskModel);
 		wizard2.setForcePreviousAndNextButtons(true);
 		WizardDialog dialog = new WizardDialog(getShell(), wizard2);
-		return dialog.open();
+		int returnValue = dialog.open();
+		if (returnValue != Window.CANCEL) {
+			updateRuntimeCombo(serverType);
+			IRuntime rt = (IRuntime)taskModel.getObject(TaskModel.TASK_RUNTIME);
+			if (rt != null && rt.getName() != null && runtimeCombo.indexOf(rt.getName()) != -1) {
+				setRuntime(rt);
+				runtimeCombo.select(runtimeCombo.indexOf(rt.getName()));
+			}
+		}
+		return returnValue;
 	}
 
 	public void setHost(String host) {