From 94d6df471a406a03bb1afba8ca3ae9c0fbf366b5 Mon Sep 17 00:00:00 2001
From: jeffhao <jeffhao@google.com>
Date: Mon, 26 Nov 2012 16:02:12 -0800
Subject: Fixes to make all run-tests except 051-thread work.

- Moved exception delivery into common method DeliverException
- Renamed old DeliverException to QuickDeliverException since it is only
  used by quick
- Fixed null checks for arrays returned by GetReference
- Standardized ArrayStoreException error message
- Added additional sleeps to ensure threads stay alive long enough in
  051-thread, and that <clinit> is complete for 084-class-init

Change-Id: I9ca306896a4bd10f453150fcf3965d9750fa0cbd
---
 src/object.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/object.cc')

diff --git a/src/object.cc b/src/object.cc
index 147b882a50..210c42d54f 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -1480,7 +1480,7 @@ bool Array::ThrowArrayIndexOutOfBoundsException(int32_t index) const {
 
 bool Array::ThrowArrayStoreException(Object* object) const {
   Thread::Current()->ThrowNewExceptionF("Ljava/lang/ArrayStoreException;",
-      "Can't store an element of type %s into an array of type %s",
+      "%s cannot be stored in an array of type %s",
       PrettyTypeOf(object).c_str(), PrettyTypeOf(this).c_str());
   return false;
 }
-- 
cgit v1.2.3-59-g8ed1b