Bug 421487 - Check for null (again) when unwinding the thread local coordination stack.I20131126-0800

The previous fix still had a small window of opportunity for an NPE to occur. Each call to peek results in orphaned
coordination processing, so despite the initial check for coordinator.peek() != null, the subsequent calls to peek() could
result in null if a coordination on the thread local stack became orphaned during that time.

1 files changed, 7 insertions, 4 deletions

diff --git a/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationImpl.java b/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationImpl.java
index 1a241b9ef..2ad246c99 100644
--- a/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationImpl.java
+++ b/bundles/org.eclipse.equinox.coordinator/src/org/eclipse/equinox/coordinator/CoordinationImpl.java
@@ -138,11 +138,14 @@ public class CoordinationImpl {
 				}
 				// Unwind the stack in case there are other coordinations higher
 				// up than this one. See bug 421487 for why peek() may be null.
-				while (!(coordinator.peek() == null || coordinator.peek().equals(referent))) {
+				for (Coordination peeked = coordinator.peek(); !(peeked == null || referent.equals(peeked)); peeked = coordinator.peek()) {
 					try {
-						coordinator.peek().end();
-					} catch (CoordinationException e) {
-						coordinator.peek().fail(e);
+						peeked.end();
+					}
+					catch (CoordinationException e) {
+						peeked = coordinator.peek();
+						if (peeked != null)
+							peeked.fail(e);
 					}
 				}
 				// A coordination is removed from the thread local stack only when being ended.