diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-06-22 16:59:15 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-06-22 16:59:15 +0000 |
| commit | 6d82bb8521a4707e6614523956e83307f5718792 (patch) | |
| tree | 22b6780a71db92d402183472f143678203061184 | |
| parent | 746907b22568ce903b78bd00de93503b2b56476b (diff) | |
| download | gcc-6d82bb8521a4707e6614523956e83307f5718792.zip gcc-6d82bb8521a4707e6614523956e83307f5718792.tar.gz gcc-6d82bb8521a4707e6614523956e83307f5718792.tar.bz2 | |
natField.cc (getAddr): Allow setting of final field when it is accessible.
* java/lang/reflect/natField.cc (getAddr): Allow setting of final
field when it is accessible.
From-SVN: r114896
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/natField.cc | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c1dcf66..071d27d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-06-22 Tom Tromey <tromey@redhat.com> + + * java/lang/reflect/natField.cc (getAddr): Allow setting of final + field when it is accessible. + 2006-06-21 Bryce McKinlay <mckinlay@redhat.com> * include/win32-threads.h (_Jv_ThreadDesc_t): New typedef. diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc index ae68639..487f62a 100644 --- a/libjava/java/lang/reflect/natField.cc +++ b/libjava/java/lang/reflect/natField.cc @@ -72,6 +72,10 @@ getAddr (java::lang::reflect::Field* field, jclass caller, jobject obj, // Setting a final field is usually not allowed. if (checkFinal + // As of 1.5, you can set a non-static final field if it is + // accessible. + && (! field->isAccessible() + || (field->getModifiers() & java::lang::reflect::Modifier::STATIC)) && (field->getModifiers() & java::lang::reflect::Modifier::FINAL)) throw new java::lang::IllegalAccessException(JvNewStringUTF ("Field is final")); |