diff options
| author | Sam Berlin <sameb@google.com> | 2013-12-06 17:04:48 -0500 |
|---|---|---|
| committer | Sam Berlin <sameb@google.com> | 2013-12-06 17:34:24 -0500 |
| commit | 9b268e4467753f31eb6dfeb4001e76e32b01f5a3 (patch) | |
| tree | 4002e70b3bf3ff0caab0304432783120b5f4b008 /core/src/com/google/inject | |
| parent | 5e5e2f552430c3b6e352ef43395b20af8688a90e (diff) | |
| download | guice-9b268e4467753f31eb6dfeb4001e76e32b01f5a3.tar.gz | |
Pass the correct stage to Modules.override, so currentStage() works.
Fixes issue 784 -- patch thanks to Tavian Barnes.
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=57755697
Diffstat (limited to 'core/src/com/google/inject')
| -rw-r--r-- | core/src/com/google/inject/util/Modules.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/com/google/inject/util/Modules.java b/core/src/com/google/inject/util/Modules.java index adb4ee4f..c166b8e2 100644 --- a/core/src/com/google/inject/util/Modules.java +++ b/core/src/com/google/inject/util/Modules.java @@ -171,7 +171,7 @@ public final class Modules { @Override public void configure() { Binder baseBinder = binder(); - List<Element> baseElements = Elements.getElements(baseModules); + List<Element> baseElements = Elements.getElements(currentStage(), baseModules); // If the sole element was a PrivateElements, we want to override // the private elements within that -- so refocus our elements @@ -191,7 +191,7 @@ public final class Modules { final Binder binder = baseBinder.skipSources(this.getClass()); final LinkedHashSet<Element> elements = new LinkedHashSet<Element>(baseElements); - final List<Element> overrideElements = Elements.getElements(overrides); + final List<Element> overrideElements = Elements.getElements(currentStage(), overrides); final Set<Key<?>> overriddenKeys = Sets.newHashSet(); final Map<Class<? extends Annotation>, ScopeBinding> overridesScopeAnnotations = |