commit 89c1feb0a69a7707b271086e749975b3f7acacf7
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:55 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:03:55 2008 -0800
tree 003624a03635e05020a47fc72a2c42934e3f0703
parent 2ad60cfc28e14ee8f0bb038720836a4696c478ad

Code drop from //branches/cupcake/...@124589

vm/interp/Interp.c

diff --git a/vm/interp/Interp.c b/vm/interp/Interp.c
index 41c5cf5..0287f82 100644
--- a/vm/interp/Interp.c
+++ b/vm/interp/Interp.c
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 /*
  * Main interpreter entry point and support functions.
  *
@@ -518,15 +519,16 @@
  * Returns true if job is completed, otherwise false to indicate that
  * an exception has been thrown.
  */
-bool dvmInterpHandleFillArrayData(ArrayObject* arrayObj, 
-                                  const u2* arrayData)
+bool dvmInterpHandleFillArrayData(ArrayObject* arrayObj, const u2* arrayData)
 {
     u2 width;
     u4 size;
 
-    if (!checkForNull((Object*) arrayObj)) {
+    if (arrayObj == NULL) {
+        dvmThrowException("Ljava/lang/NullPointerException;", NULL);
         return false;
     }
+
     /*
      * Array data table format:
      *  ushort ident = 0x0300   magic value
@@ -713,3 +715,4 @@
 
     *pResult = interpState.retval;
 }
+