Attachment 189520 Details for Bug 307587 – Fixed concurrent natures

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fixed concurrent natures

patch_307587.txt (text/plain), 15.63 KB, created by Malgorzata Janczarska

on 2011-02-22 12:58:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2011-02-22 12:58:23 EST

Size: 15.63 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.resources
>Index: src/org/eclipse/core/internal/events/LifecycleEvent.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/events/LifecycleEvent.java,v
>retrieving revision 1.11
>diff -u -r1.11 LifecycleEvent.java
>--- src/org/eclipse/core/internal/events/LifecycleEvent.java	5 Oct 2009 21:40:29 -0000	1.11
>+++ src/org/eclipse/core/internal/events/LifecycleEvent.java	22 Feb 2011 17:53:43 -0000
>@@ -21,7 +21,7 @@
> public class LifecycleEvent {
> 	//constants for kinds of internal workspace lifecycle events
> 	public static final int PRE_PROJECT_CLOSE = 0x01;
>-	public static final int PRE_PROJECT_CHANGE = 0x02;
>+	public static final int POST_PROJECT_CHANGE = 0x02;
> 	public static final int PRE_PROJECT_COPY = 0x04;
> 	public static final int PRE_PROJECT_CREATE = 0x08;
> 
>Index: src/org/eclipse/core/internal/resources/ContentDescriptionManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/ContentDescriptionManager.java,v
>retrieving revision 1.39
>diff -u -r1.39 ContentDescriptionManager.java
>--- src/org/eclipse/core/internal/resources/ContentDescriptionManager.java	1 Feb 2011 11:37:52 -0000	1.39
>+++ src/org/eclipse/core/internal/resources/ContentDescriptionManager.java	22 Feb 2011 17:53:44 -0000
>@@ -457,7 +457,7 @@
> 	public void handleEvent(LifecycleEvent event) {
> 		//TODO are these the only events we care about?
> 		switch (event.kind) {
>-			case LifecycleEvent.PRE_PROJECT_CHANGE :
>+			case LifecycleEvent.POST_PROJECT_CHANGE :
> 			// if the project changes, its natures may have changed as well (content types may be associated to natures)
> 			case LifecycleEvent.PRE_PROJECT_DELETE :
> 			// if the project gets deleted, we may get confused if it is recreated again (content ids might match)
>Index: src/org/eclipse/core/internal/resources/NatureManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/NatureManager.java,v
>retrieving revision 1.33
>diff -u -r1.33 NatureManager.java
>--- src/org/eclipse/core/internal/resources/NatureManager.java	1 Feb 2011 11:37:52 -0000	1.33
>+++ src/org/eclipse/core/internal/resources/NatureManager.java	22 Feb 2011 17:53:44 -0000
>@@ -125,7 +125,7 @@
> 
> 	public void handleEvent(LifecycleEvent event) {
> 		switch (event.kind) {
>-			case LifecycleEvent.PRE_PROJECT_CHANGE :
>+			case LifecycleEvent.POST_PROJECT_CHANGE :
> 			case LifecycleEvent.PRE_PROJECT_CLOSE :
> 			case LifecycleEvent.PRE_PROJECT_DELETE :
> 			case LifecycleEvent.PRE_PROJECT_MOVE :
>Index: src/org/eclipse/core/internal/resources/Project.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Project.java,v
>retrieving revision 1.179
>diff -u -r1.179 Project.java
>--- src/org/eclipse/core/internal/resources/Project.java	1 Feb 2011 11:37:52 -0000	1.179
>+++ src/org/eclipse/core/internal/resources/Project.java	22 Feb 2011 17:53:44 -0000
>@@ -1343,7 +1343,6 @@
> 				//see if we have an old .prj file
> 				if (!hadSavedDescription)
> 					hadSavedDescription = workspace.getMetaArea().hasSavedProject(this);
>-				workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_PROJECT_CHANGE, this));
> 				workspace.beginOperation(true);
> 				MultiStatus status = basicSetDescription(newDescription, updateFlags);
> 				if (hadSavedDescription && !status.isOK())
>@@ -1361,6 +1360,7 @@
> 				if (!status.isOK())
> 					throw new CoreException(status);
> 			} finally {
>+				workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.POST_PROJECT_CHANGE, this));
> 				workspace.endOperation(rule, true, Policy.subMonitorFor(monitor, Policy.endOpWork));
> 			}
> 		} finally {
>@@ -1399,13 +1399,13 @@
> 			final ISchedulingRule rule = workspace.getRuleFactory().modifyRule(this);
> 			try {
> 				workspace.prepareOperation(rule, monitor);
>-				workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_PROJECT_CHANGE, this));
> 				workspace.beginOperation(true);
> 				super.touch(Policy.subMonitorFor(monitor, Policy.opWork));
> 			} catch (OperationCanceledException e) {
> 				workspace.getWorkManager().operationCanceled();
> 				throw e;
> 			} finally {
>+				workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.POST_PROJECT_CHANGE, this));
> 				workspace.endOperation(rule, true, Policy.subMonitorFor(monitor, Policy.endOpWork));
> 			}
> 		} finally {
>@@ -1423,7 +1423,6 @@
> 			return;
> 		ProjectDescription.isReading = true;
> 		try {
>-			workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_PROJECT_CHANGE, this));
> 			ProjectDescription description = getLocalManager().read(this, false);
> 			//links can only be created if the project is open
> 			IStatus result = null;
>@@ -1433,6 +1432,7 @@
> 			if (result != null && !result.isOK())
> 				throw new CoreException(result);
> 		} finally {
>+			workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.POST_PROJECT_CHANGE, this));
> 			ProjectDescription.isReading = false;
> 		}
> 	}
>#P org.eclipse.core.tests.resources
>Index: TestFiles/testProject/.project
>===================================================================
>RCS file: TestFiles/testProject/.project
>diff -N TestFiles/testProject/.project
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ TestFiles/testProject/.project	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,113 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<projectDescription>
>+	<name>testProject</name>
>+	<comment></comment>
>+	<projects>
>+	</projects>
>+	<buildSpec>
>+	</buildSpec>
>+	<natures>
>+		<nature>org.eclipse.pde.PluginNature</nature>
>+		<nature>org.eclipse.jdt.core.javanature</nature>
>+		<nature>nature1</nature>
>+<nature>nature2</nature>
>+<nature>nature3</nature>
>+<nature>nature4</nature>
>+<nature>nature5</nature>
>+<nature>nature6</nature>
>+<nature>nature7</nature>
>+<nature>nature8</nature>
>+<nature>nature9</nature>
>+<nature>nature10</nature>
>+<nature>nature11</nature>
>+<nature>nature12</nature>
>+<nature>nature13</nature>
>+<nature>nature14</nature>
>+<nature>nature15</nature>
>+<nature>nature16</nature>
>+<nature>nature17</nature>
>+<nature>nature18</nature>
>+<nature>nature19</nature>
>+<nature>nature20</nature>
>+<nature>nature21</nature>
>+<nature>nature22</nature>
>+<nature>nature23</nature>
>+<nature>nature24</nature>
>+<nature>nature25</nature>
>+<nature>nature26</nature>
>+<nature>nature27</nature>
>+<nature>nature28</nature>
>+<nature>nature29</nature>
>+<nature>nature30</nature>
>+<nature>nature31</nature>
>+<nature>nature32</nature>
>+<nature>nature33</nature>
>+<nature>nature34</nature>
>+<nature>nature35</nature>
>+<nature>nature36</nature>
>+<nature>nature37</nature>
>+<nature>nature38</nature>
>+<nature>nature39</nature>
>+<nature>nature40</nature>
>+<nature>nature41</nature>
>+<nature>nature42</nature>
>+<nature>nature43</nature>
>+<nature>nature44</nature>
>+<nature>nature45</nature>
>+<nature>nature46</nature>
>+<nature>nature47</nature>
>+<nature>nature48</nature>
>+<nature>nature49</nature>
>+<nature>nature50</nature>
>+<nature>nature51</nature>
>+<nature>nature52</nature>
>+<nature>nature53</nature>
>+<nature>nature54</nature>
>+<nature>nature55</nature>
>+<nature>nature56</nature>
>+<nature>nature57</nature>
>+<nature>nature58</nature>
>+<nature>nature59</nature>
>+<nature>nature60</nature>
>+<nature>nature61</nature>
>+<nature>nature62</nature>
>+<nature>nature63</nature>
>+<nature>nature64</nature>
>+<nature>nature65</nature>
>+<nature>nature66</nature>
>+<nature>nature67</nature>
>+<nature>nature68</nature>
>+<nature>nature69</nature>
>+<nature>nature70</nature>
>+<nature>nature71</nature>
>+<nature>nature72</nature>
>+<nature>nature73</nature>
>+<nature>nature74</nature>
>+<nature>nature75</nature>
>+<nature>nature76</nature>
>+<nature>nature77</nature>
>+<nature>nature78</nature>
>+<nature>nature79</nature>
>+<nature>nature80</nature>
>+<nature>nature81</nature>
>+<nature>nature82</nature>
>+<nature>nature83</nature>
>+<nature>nature84</nature>
>+<nature>nature85</nature>
>+<nature>nature86</nature>
>+<nature>nature87</nature>
>+<nature>nature88</nature>
>+<nature>nature89</nature>
>+<nature>nature90</nature>
>+<nature>nature91</nature>
>+<nature>nature92</nature>
>+<nature>nature93</nature>
>+<nature>nature94</nature>
>+<nature>nature95</nature>
>+<nature>nature96</nature>
>+<nature>nature97</nature>
>+<nature>nature98</nature>
>+<nature>nature99</nature>
>+<nature>nature100</nature>
>+	</natures>
>+</projectDescription>
>Index: src/org/eclipse/core/tests/resources/ConcurrentNatureTest.java
>===================================================================
>RCS file: src/org/eclipse/core/tests/resources/ConcurrentNatureTest.java
>diff -N src/org/eclipse/core/tests/resources/ConcurrentNatureTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/tests/resources/ConcurrentNatureTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,88 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 IBM Corporation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     IBM Corporation - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.core.tests.resources;
>+
>+import java.io.FileInputStream;
>+import junit.framework.TestCase;
>+import org.eclipse.core.internal.resources.Project;
>+import org.eclipse.core.resources.*;
>+import org.eclipse.core.runtime.*;
>+import org.eclipse.core.tests.harness.FileSystemHelper;
>+
>+/**
>+ * 
>+ */
>+public class ConcurrentNatureTest extends TestCase {
>+	//	private static final String projectName = "Project";
>+	private static String projectPath;
>+	private static final String nature = "org.eclipse.jdt.core.javanature";
>+	private static final String testProjectName = "testProject";
>+
>+	protected void setUp() throws Exception {
>+		projectPath = FileLocator.resolve(Platform.getBundle("org.eclipse.core.tests.resources").getEntry("TestFiles/testProject")).getPath();
>+	}
>+
>+	protected void tearDown() throws Exception {
>+		super.tearDown();
>+		ResourcesPlugin.getWorkspace().getRoot().refreshLocal(IResource.DEPTH_INFINITE, null);
>+		FileSystemHelper.clear(ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile());
>+	}
>+
>+	private class CheckNatureThread extends Thread {
>+		private boolean finished[];
>+
>+		public CheckNatureThread(boolean[] finished) {
>+			super();
>+			this.finished = finished;
>+		}
>+
>+		public void run() {
>+			Project project = (Project) ResourcesPlugin.getWorkspace().getRoot().getProject(testProjectName);
>+
>+			try {
>+				while (finished[0] == false) {
>+					if (project.exists() && project.isOpen())
>+						System.out.println("Nature enabled:" + project.isNatureEnabled(nature) + " simple check: " + project.hasNature(nature));
>+					sleep(5);
>+				}
>+			} catch (CoreException e) {
>+				e.printStackTrace();
>+				fail("CoreExp");
>+			} catch (InterruptedException e) {
>+				e.printStackTrace();
>+				fail("InterruptedExp");
>+			}
>+		}
>+
>+	}
>+
>+	public void testConcurrentNatures() throws Exception {
>+		boolean finished[] = new boolean[1];
>+		finished[0] = false;
>+		CheckNatureThread t = new CheckNatureThread(finished);
>+		Project project = (Project) ResourcesPlugin.getWorkspace().getRoot().getProject(testProjectName);
>+		if (!project.exists()) {
>+			project.create(null);
>+		}
>+		if (!project.isOpen()) {
>+			project.open(null);
>+		}
>+		t.start();
>+
>+		IFile descriptionFile = project.getFile(".project");
>+
>+		descriptionFile.setContents(new FileInputStream(projectPath + "/.project"), 0, null);
>+
>+		finished[0] = true;
>+		assertTrue(project.hasNature(nature));
>+		assertTrue(project.isNatureEnabled(nature));
>+	}
>+}
>Index: src/org/eclipse/core/tests/resources/NatureTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NatureTest.java,v
>retrieving revision 1.14
>diff -u -r1.14 NatureTest.java
>--- src/org/eclipse/core/tests/resources/NatureTest.java	16 May 2010 02:08:05 -0000	1.14
>+++ src/org/eclipse/core/tests/resources/NatureTest.java	22 Feb 2011 17:53:46 -0000
>@@ -18,7 +18,7 @@
> import org.eclipse.core.internal.resources.File;
> import org.eclipse.core.internal.resources.Project;
> import org.eclipse.core.resources.*;
>-import org.eclipse.core.runtime.CoreException;
>+import org.eclipse.core.runtime.*;
> import org.eclipse.core.runtime.jobs.IJobManager;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.core.tests.internal.resources.SimpleNature;
>@@ -29,6 +29,10 @@
>  * APIs on IWorkspace are tested by IWorkspaceTest.
>  */
> public class NatureTest extends ResourceTest {
>+
>+	private static final String nature = "org.eclipse.jdt.core.javanature";
>+	private static final String testProjectName = "testProject";
>+
> 	/**
> 	 * Constructor for NatureTest.
> 	 */
>@@ -345,4 +349,82 @@
> 		out.close();
> 	}
> 
>+	private class CheckNatureThread extends Thread {
>+		private boolean finished[];
>+
>+		public CheckNatureThread(boolean[] finished) {
>+			super();
>+			this.finished = finished;
>+		}
>+
>+		public void run() {
>+			Project project = (Project) ResourcesPlugin.getWorkspace().getRoot().getProject(testProjectName);
>+
>+			try {
>+				while (finished[0] == false) {
>+					if (project.exists() && project.isOpen())
>+						project.isNatureEnabled(nature);
>+					sleep(5);
>+				}
>+			} catch (CoreException e) {
>+				e.printStackTrace();
>+				fail("3.0", e);
>+			} catch (InterruptedException e) {
>+				e.printStackTrace();
>+				fail("3.1", e);
>+			}
>+		}
>+
>+	}
>+
>+	/**
>+	 * Changes project description and parallel checks {@link IProject#isNatureEnabled(String)},
>+	 * to check if natures value is cached properly.
>+	 * 
>+	 * See discussion on Bug 307587.
>+	 * @throws Exception
>+	 */
>+	public void testConcurrentNatures() throws Exception {
>+		boolean finished[] = new boolean[1];
>+		finished[0] = false;
>+		CheckNatureThread t = new CheckNatureThread(finished);
>+		IWorkspace ws = ResourcesPlugin.getWorkspace();
>+		Project project = (Project) ws.getRoot().getProject(testProjectName);
>+		ensureExistsInWorkspace(project, true);
>+
>+		t.start();
>+
>+		java.io.File desc = null;
>+		try {
>+			IFileStore descStore = ((File) project.getFile(IProjectDescription.DESCRIPTION_FILE_NAME)).getStore();
>+			desc = descStore.toLocalFile(EFS.NONE, getMonitor());
>+		} catch (CoreException e) {
>+			fail("1.0");
>+		}
>+
>+		String projectTemplatePath = FileLocator.resolve(Platform.getBundle("org.eclipse.core.tests.resources").getEntry("TestFiles/testProject")).getPath();
>+
>+		java.io.File descTemplate = new java.io.File(projectTemplatePath + "/" + IProjectDescription.DESCRIPTION_FILE_NAME);
>+
>+		try {
>+			// Make sure enough time has past to bump file's
>+			// timestamp during the copy  
>+			Thread.sleep(1000);
>+		} catch (InterruptedException e) {
>+			fail("1.1", e);
>+		}
>+
>+		copy(descTemplate, desc);
>+
>+		try {
>+			project.refreshLocal(IResource.DEPTH_INFINITE, getMonitor());
>+		} catch (CoreException e) {
>+			fail("2.0", e);
>+		}
>+
>+		finished[0] = true;
>+		assertTrue("2.1", project.hasNature(nature));
>+		assertTrue("2.1", project.isNatureEnabled(nature));
>+	}
>+
> }

Actions: View | Diff

Attachments on bug 307587: 177513 | 177601 | 177612 | 177643 | 185251 | 185303 | 188503 | 188516 | 189502 | 189520