Author: rob.stryker(a)jboss.com Date: 2012-02-17 08:22:08 -0500 (Fri, 17 Feb 2012) New Revision: 38869 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java Log: patch for the recurring 'already publishing' error Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-02-17 13:17:15 UTC (rev 38868) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-02-17 13:22:08 UTC (rev 38869) @@ -84,10 +84,13 @@ protected void publishFinish(IProgressMonitor monitor) throws CoreException { if( method == null ) throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Not publishing")); //$NON-NLS-1$ - int result = method.publishFinish(this, monitor); - setServerPublishState(result); - publishTaskModel = null; - method = null; + try { + int result = method.publishFinish(this, monitor); + setServerPublishState(result); + } finally { + publishTaskModel = null; + method = null; + } } protected void setPublishData(String key, Object val) { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-02-17 13:17:15 UTC (rev 38868) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-02-17 13:22:08 UTC (rev 38869) @@ -137,6 +137,9 @@ } } catch(CoreException ce) { // Comes if either commit or push has failed + if( ce.getMessage().contains("UP_TO_DATE")) + return null; + try { result = EGitUtils.pushForce(remoteName, repository, new SubProgressMonitor(monitor, 100)); monitor.done();