commit adae8ccfcefd28307ffbd39d2d41db70c8449a76
author limpbizkit <limpbizkit@d779f126-a31b-0410-b53b-1d3aecad763e> Sat Aug 25 16:18:04 2007 +0000
committer limpbizkit <limpbizkit@d779f126-a31b-0410-b53b-1d3aecad763e> Sat Aug 25 16:18:04 2007 +0000
tree cb160fbebe3f75bd8c8235c031c7b325bba15286
parent b946ca2ea0a1b5f8444dc9da4acdb0eb4d7b23ae

Removing Objects.nonNull(Object[])

This method was disabled previously, so it wasn't catching any errors.

We still do not inject methods with new values because now those values are caught within the corresponding InternalFactory.

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

src/com/google/inject/DefaultConstructionProxyFactory.java

diff --git a/src/com/google/inject/DefaultConstructionProxyFactory.java b/src/com/google/inject/DefaultConstructionProxyFactory.java
index 4140c68..ca99894 100644
--- a/src/com/google/inject/DefaultConstructionProxyFactory.java
+++ b/src/com/google/inject/DefaultConstructionProxyFactory.java
@@ -41,7 +41,6 @@
       return new ConstructionProxy<T>() {
         public T newInstance(Object... arguments) throws
             InvocationTargetException {
-          Objects.assertNoNulls(arguments);
           try {
             return constructor.newInstance(arguments);
           }
@@ -63,7 +62,6 @@
       @SuppressWarnings("unchecked")
       public T newInstance(Object... arguments)
           throws InvocationTargetException {
-        Objects.assertNoNulls(arguments);
         return (T) fastConstructor.newInstance(arguments);
       }
     };

src/com/google/inject/InjectorImpl.java

diff --git a/src/com/google/inject/InjectorImpl.java b/src/com/google/inject/InjectorImpl.java
index d63adba..903e280 100644
--- a/src/com/google/inject/InjectorImpl.java
+++ b/src/com/google/inject/InjectorImpl.java
@@ -549,7 +549,6 @@
         this.methodInvoker = new MethodInvoker() {
           public Object invoke(Object target, Object... parameters) throws
               IllegalAccessException, InvocationTargetException {
-            Objects.assertNoNulls(parameters);
             return method.invoke(target, parameters);
           }
         };
@@ -561,7 +560,6 @@
         this.methodInvoker = new MethodInvoker() {
           public Object invoke(Object target, Object... parameters)
           throws IllegalAccessException, InvocationTargetException {
-            Objects.assertNoNulls(parameters);
             return fastMethod.invoke(target, parameters);
           }
         };

src/com/google/inject/ProxyFactory.java

diff --git a/src/com/google/inject/ProxyFactory.java b/src/com/google/inject/ProxyFactory.java
index 9cf23e4..418be0e 100644
--- a/src/com/google/inject/ProxyFactory.java
+++ b/src/com/google/inject/ProxyFactory.java
@@ -172,7 +172,6 @@
       @SuppressWarnings("unchecked")
       public T newInstance(Object... arguments)
           throws InvocationTargetException {
-        Objects.assertNoNulls(arguments);
         return (T) fastConstructor.newInstance(arguments);
       }
     };

src/com/google/inject/internal/Objects.java

diff --git a/src/com/google/inject/internal/Objects.java b/src/com/google/inject/internal/Objects.java
index d815db0..a40d116 100644
--- a/src/com/google/inject/internal/Objects.java
+++ b/src/com/google/inject/internal/Objects.java
@@ -51,26 +51,4 @@
 
     return a.equals(b);
   }
-
-  /**
-   * We use this as a sanity check immediately before injecting into a method
-   * or constructor, to make sure we aren't supplying a null.  This should never
-   * happen because we should have caught the problem earlier.  Perhaps this 
-   * should be used with Java asserts...
-   */
-  public static void assertNoNulls(Object[] objects) {
-    if (allowNullsBadBadBad) {
-      return;
-    }
-    if (objects != null) { // hmm. weird.
-      for (Object object : objects) {
-        if (object == null) {
-          throw new AssertionError();
-        }
-      }
-    }
-  }
-
-  // TODO(kevinb): gee, ya think we might want to remove this?
-  private static final boolean allowNullsBadBadBad = true;
 }