Apply patch https://git.eclipse.org/c/56954/7 to org.eclipse.core.jobs

GoogleCloudPlatform · Aug 22, 2017 · 56d4538 · 56d4538
1 parent e0c8002
commit 56d4538
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 38 deletions.
diff --git a/...arty/patches/mars/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java b/...arty/patches/mars/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java
@@ -288,9 +288,11 @@ else if (state != Job.NONE)
 		} finally {
 			if (interrupted)
 				Thread.currentThread().interrupt();
-			//only update the lock state if we ended up using the thread job that was given to us
-			waitEnd(threadJob, threadJob == result, monitor);
-			if (threadJob == result) {
+			ISchedulingRule resultRule = result.getRule();
+			ISchedulingRule threadJobRule = threadJob.getRule();
+			boolean containsRule = resultRule != null && threadJobRule != null && resultRule.contains(threadJobRule);
+			waitEnd(threadJob, containsRule, monitor);
+			if (containsRule) {
 				if (waiting)
 					manager.implicitJobs.removeWaiting(threadJob);
 			}

diff --git a/...arty/patches/neon/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java b/...arty/patches/neon/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java
@@ -288,9 +288,11 @@ else if (state != Job.NONE)
 		} finally {
 			if (interrupted)
 				Thread.currentThread().interrupt();
-			//only update the lock state if we ended up using the thread job that was given to us
-			waitEnd(threadJob, threadJob == result, monitor);
-			if (threadJob == result) {
+			ISchedulingRule resultRule = result.getRule();
+			ISchedulingRule threadJobRule = threadJob.getRule();
+			boolean containsRule = resultRule != null && threadJobRule != null && resultRule.contains(threadJobRule);
+			waitEnd(threadJob, containsRule, monitor);
+			if (containsRule) {
 				if (waiting)
 					manager.implicitJobs.removeWaiting(threadJob);
 			}

diff --git a/third_party/patches/oxygen/org.eclipse.core.jobs/META-INF/MANIFEST.MF b/third_party/patches/oxygen/org.eclipse.core.jobs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: org.eclipse.core.jobs patched for bug 478634
 Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true
-Bundle-Version: 3.9.1.qualifier
+Bundle-Version: 3.9.0.v20170322-0013
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,

diff --git a/third_party/patches/oxygen/org.eclipse.core.jobs/pom.xml b/third_party/patches/oxygen/org.eclipse.core.jobs/pom.xml
diff --git a/...ty/patches/oxygen/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java b/...ty/patches/oxygen/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/ThreadJob.java
@@ -303,9 +303,11 @@ else if (state != Job.NONE)
 				manager.getLockManager().removeLockWaitThread(currentThread, threadJob.getRule());
 			}
 		} finally {
-			//only update the lock state if we ended up using the thread job that was given to us
-			waitEnd(threadJob, threadJob == result, monitor);
-			if (threadJob == result) {
+			ISchedulingRule resultRule = result.getRule();
+			ISchedulingRule threadJobRule = threadJob.getRule();
+			boolean containsRule = resultRule != null && threadJobRule != null && resultRule.contains(threadJobRule);
+			waitEnd(threadJob, containsRule, monitor);
+			if (containsRule) {
 				if (waiting)
 					manager.implicitJobs.removeWaiting(threadJob);
 			}