diff options
author | 2012-11-26 16:02:12 -0800 | |
---|---|---|
committer | 2012-11-26 16:02:12 -0800 | |
commit | 94d6df471a406a03bb1afba8ca3ae9c0fbf366b5 (patch) | |
tree | f89af30dbe4a23dc6f62bb17c3b0a36b778ade33 /src/object.cc | |
parent | 5bc252873e6e50f8257e33ca158d0e350413fcbf (diff) |
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
Diffstat (limited to 'src/object.cc')
-rw-r--r-- | src/object.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |