Author: adietish Date: 2011-12-16 12:09:20 -0500 (Fri, 16 Dec 2011) New Revision: 37398 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java Log: [JBIDE-10502] waiting for jenkins to become ready Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-16 14:51:46 UTC (rev 37397) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-12-16 17:09:20 UTC (rev 37398) @@ -65,14 +65,7 @@ public void createApplication() throws OpenShiftException { IApplication application = createApplication(name, cartridge); - final boolean isApplicationAvailable = application.waitForAccessible(APP_CREATION_TIMEOUT * 1000); - if (isApplicationAvailable) { - setApplication(application); - } else { - throw new OpenShiftApplicationNotAvailableException(NLS.bind( - OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING, - application.getApplicationUrl())); - } + setApplication(application); } public void setApplication(IApplication application) { @@ -84,10 +77,21 @@ } public IApplication createApplication(String name, ICartridge cartridge) throws OpenShiftException { - return getUser().createApplication(name, cartridge); + IApplication application = getUser().createApplication(name, cartridge); + waitForAccessible(application); + return application; } public boolean hasApplication(String name) throws OpenShiftException { return user.hasApplication(name); } + + private void waitForAccessible(IApplication application) throws OpenShiftApplicationNotAvailableException, OpenShiftException { + if (!application.waitForAccessible(APP_CREATION_TIMEOUT * 1000)) { + throw new OpenShiftApplicationNotAvailableException(NLS.bind( + OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING, + application.getApplicationUrl())); + } + } + } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-12-16 14:51:46 UTC (rev 37397) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-12-16 17:09:20 UTC (rev 37398) @@ -94,10 +94,9 @@ } public IApplication createJenkinsApplication(String name) throws OpenShiftException { - IApplication application = wizardModel.getUser().createApplication(name, ICartridge.JENKINS_14); - return application; + return wizardModel.createApplication(name, ICartridge.JENKINS_14); } - + /** * Embeds/removes the cartridges that were added/removed in this wizard * page.