commit 87aea1b0c3c1c8689468c8e7d89d128f15e8030a
author isaac.q.shum <isaac.q.shum@d779f126-a31b-0410-b53b-1d3aecad763e> Tue Feb 02 04:55:45 2010 +0000
committer isaac.q.shum <isaac.q.shum@d779f126-a31b-0410-b53b-1d3aecad763e> Tue Feb 02 04:55:45 2010 +0000
tree 26b5a5ad4219d19d6f2b01ab5ea776def275b2b9
parent 0254c2a26d2b045cc64e54ec5e3eeaa2beab3a10

Fix for assisted inject bug introduced in r1120.

git-svn-id: https://google-guice.googlecode.com/svn/trunk@1139 d779f126-a31b-0410-b53b-1d3aecad763e

extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java

diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
index f4c3b16..4262615 100755
--- a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
+++ b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
@@ -94,7 +94,7 @@
       }
     }
 
-    return provider.get();
+    return isProvider ? provider : provider.get();
   }
 
   public boolean isBound(Injector injector) {