Attachment 156898 Details for Bug 282483 – Important fix to smoketest failures

[patch] Important fix to smoketest failures

282483.smoketestfail.1.patch (text/plain), 1.95 KB, created by Rob Stryker

on 2010-01-22 02:38:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Stryker

Created: 2010-01-22 02:38:04 EST

Size: 1.95 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.server.core
>Index: servercore/org/eclipse/wst/server/core/internal/Server.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.core/servercore/org/eclipse/wst/server/core/internal/Server.java,v
>retrieving revision 1.171
>diff -u -r1.171 Server.java
>--- servercore/org/eclipse/wst/server/core/internal/Server.java	20 Jan 2010 21:46:14 -0000	1.171
>+++ servercore/org/eclipse/wst/server/core/internal/Server.java	22 Jan 2010 07:36:02 -0000
>@@ -796,8 +796,8 @@
> 	
> 	protected void autoPublish(IResourceChangeEvent event) {
> 		stopAutoPublish();
>-		boolean buildOccurred = didBuildOccur(event);
>-		boolean projectClosedOrDeleted = isProjectCloseOrDeleteEvent(event);
>+		boolean buildOccurred = event != null && didBuildOccur(event);
>+		boolean projectClosedOrDeleted = event != null && isProjectCloseOrDeleteEvent(event);
> 		
> 		if (getAutoPublishSetting() == AUTO_PUBLISH_DISABLE)
> 			return;
>#P org.eclipse.wst.server.ui
>Index: serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java
>===================================================================
>RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java,v
>retrieving revision 1.5
>diff -u -r1.5 ServersView2.java
>--- serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java	23 Nov 2009 22:32:01 -0000	1.5
>+++ serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java	22 Jan 2010 07:36:05 -0000
>@@ -173,8 +173,9 @@
> 	protected void refreshServerContent(final IServer server){
> 		Trace.trace(Trace.FINEST, "Refreshing Content for server="+server);
> 		Display.getDefault().asyncExec(new Runnable() {
>-			public void run() {		
>-				tableViewer.refresh(server, true);
>+			public void run() {	
>+				if( !tableViewer.getTree().isDisposed() )
>+					tableViewer.refresh(server, true);
> 			}
> 		});
> 	}

Actions: View | Diff

Attachments on bug 282483: 140835 | 141038 | 154151 | 156898 | 164050