Renamed sanitize to checkForNull.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@373 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/src/com/google/inject/BoundProviderFactory.java b/src/com/google/inject/BoundProviderFactory.java
index a57513e..8cb9a4c 100644
--- a/src/com/google/inject/BoundProviderFactory.java
+++ b/src/com/google/inject/BoundProviderFactory.java
@@ -59,7 +59,7 @@
public T get(InternalContext context) {
Provider<? extends T> provider = providerFactory.get(context);
try {
- return context.sanitize(provider.get(), source);
+ return context.checkForNull(provider.get(), source);
} catch(ProvisionException e) {
throw e;
} catch(RuntimeException e) {
diff --git a/src/com/google/inject/InternalContext.java b/src/com/google/inject/InternalContext.java
index b24037c..2fae544 100644
--- a/src/com/google/inject/InternalContext.java
+++ b/src/com/google/inject/InternalContext.java
@@ -96,12 +96,9 @@
externalContextStack.remove(externalContextStack.size() - 1);
}
- /**
- * Perform sanity checks on the specified value before returning it.
- */
- <T> T sanitize(T value, Object source) {
+ <T> T checkForNull(T value, Object source) {
if (value != null
- || getExternalContext().getNullability() == Nullability.NULLABLE
+ || getExternalContext().getNullability() == Nullability.NULLABLE
|| allowNullsBadBadBad()) {
return value;
}
@@ -111,7 +108,7 @@
getExternalContext().getMember())
: String.format(ErrorMessages.CANNOT_INJECT_NULL, source);
- throw new ProvisionException(getExternalContextStack(),
+ throw new ProvisionException(getExternalContextStack(),
new NullPointerException(message),
String.format(ErrorMessages.CANNOT_INJECT_NULL, source));
}
diff --git a/src/com/google/inject/InternalFactoryToProviderAdapter.java b/src/com/google/inject/InternalFactoryToProviderAdapter.java
index 410dd2b..67fb9d9 100644
--- a/src/com/google/inject/InternalFactoryToProviderAdapter.java
+++ b/src/com/google/inject/InternalFactoryToProviderAdapter.java
@@ -39,7 +39,7 @@
public T get(InternalContext context) {
T provided = provider.get();
- return context.sanitize(provided, source);
+ return context.checkForNull(provided, source);
}
public String toString() {
