Bug 384425 - EclipseContext.getActive() incorrectly resolves lookups inv20120828-170404R4_2_1M20120912-1200M20120909-2000M20120905-2300M20120905-2230M20120905-2200M20120905-1640M20120905-1500M20120829-1200I20120917-0800I20120916-2000I20120911-1000I20120904-0800

the ancestor

only validate the object is not set locally

2 files changed, 23 insertions, 3 deletions

diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java
index 253d9c1..e2c07ef 100644
--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java
+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java
@@ -737,9 +737,9 @@ public class EclipseContext implements IEclipseContext {
 
 	public Object getActive(final String name) {
 		final String internalName = ACTIVE_VARIABLE + name;
-		if (containsKey(internalName, false)) {
+		if (containsKey(internalName, true)) {
 			trackAccess(internalName);
-			return internalGet(this, internalName, false);
+			return internalGet(this, internalName, true);
 		}
 
 		final EclipseContext originatingContext = this;
diff --git a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ActivationTest.java b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ActivationTest.java
index ca14f5f..acced63 100644
--- a/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ActivationTest.java
+++ b/tests/org.eclipse.e4.core.tests/src/org/eclipse/e4/core/internal/tests/contexts/ActivationTest.java
@@ -17,7 +17,6 @@ import javax.inject.Named;
 import junit.framework.TestCase;
 
 import org.eclipse.e4.core.contexts.ContextFunction;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.core.contexts.RunAndTrack;
@@ -140,6 +139,27 @@ public class ActivationTest extends TestCase {
 		assertEquals("5", child2.getActive("var"));
 	}
 	
+	public void testGetActiveBug384425() {
+		IEclipseContext root = EclipseContextFactory.create("root");
+
+		IEclipseContext child1 = root.createChild("child1");
+		IEclipseContext child11 = child1.createChild("child11");
+
+		IEclipseContext child2 = root.createChild("child2");
+
+		// nothing is active - we get value from the node
+		assertNull(root.getActive("var"));
+		assertNull(child1.getActive("var"));
+		assertNull(child2.getActive("var"));
+
+		child11.activateBranch();
+		child11.set("var", "1");
+
+		assertEquals("1", root.getActive("var"));
+		assertEquals("1", child1.getActive("var"));
+		assertNull(child2.getActive("var"));
+	}
+
 	public void testGetActiveRAT() {
 		IEclipseContext root = EclipseContextFactory.create("root");