Author: rob.stryker(a)jboss.com Date: 2011-11-08 23:16:08 -0500 (Tue, 08 Nov 2011) New Revision: 36236 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java Log: JBIDE-9630 - already-publishing error, may be caused by improper cleanup. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-11-09 03:24:10 UTC (rev 36235) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-11-09 04:16:08 UTC (rev 36236) @@ -98,8 +98,11 @@ } protected void publishFinish(final IProgressMonitor monitor) throws CoreException { - getDelegate().publishFinish(monitor); - super.publishFinish(monitor); + try { + getDelegate().publishFinish(monitor); + } finally { + super.publishFinish(monitor); + } } @Deprecated Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-11-09 03:24:10 UTC (rev 36235) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DelegatingJBoss7ServerBehavior.java 2011-11-09 04:16:08 UTC (rev 36236) @@ -87,8 +87,11 @@ @Override protected void publishFinish(IProgressMonitor monitor) throws CoreException { // Handle the dodeploy - createDoDeployMarkers(monitor); - super.publishFinish(new SubProgressMonitor(monitor, 1)); + try { + createDoDeployMarkers(monitor); + } finally { + super.publishFinish(new SubProgressMonitor(monitor, 1)); + } } private void createDoDeployMarkers(IProgressMonitor monitor) throws CoreException {