jdk-sandbox: comparison jdk/src/share/classes/java/lang/reflect/Field.java

equal deleted inserted replaced

-:0419f45c7761
+:44dfee24cb71
 * questions.
 */
 package java.lang.reflect;
+import sun.reflect.CallerSensitive;
 import sun.reflect.FieldAccessor;
 import sun.reflect.Reflection;
 import sun.reflect.generics.repository.FieldRepository;
 import sun.reflect.generics.factory.CoreReflectionFactory;
 import sun.reflect.generics.factory.GenericsFactory;
 * @exception NullPointerException      if the specified object is null
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 */
+@CallerSensitive
 public Object get(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).get(obj);
 }
 /**
 * Gets the value of a static or instance {@code boolean} field.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#get
 */
+@CallerSensitive
 public boolean getBoolean(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getBoolean(obj);
 }
 /**
 * Gets the value of a static or instance {@code byte} field.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#get
 */
+@CallerSensitive
 public byte getByte(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getByte(obj);
 }
 /**
 * Gets the value of a static or instance field of type
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see Field#get
 */
+@CallerSensitive
 public char getChar(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getChar(obj);
 }
 /**
 * Gets the value of a static or instance field of type
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#get
 */
+@CallerSensitive
 public short getShort(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getShort(obj);
 }
 /**
 * Gets the value of a static or instance field of type
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#get
 */
+@CallerSensitive
 public int getInt(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getInt(obj);
 }
 /**
 * Gets the value of a static or instance field of type
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#get
 */
+@CallerSensitive
 public long getLong(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getLong(obj);
 }
 /**
 * Gets the value of a static or instance field of type
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see Field#get
 */
+@CallerSensitive
 public float getFloat(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getFloat(obj);
 }
 /**
 * Gets the value of a static or instance field of type
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#get
 */
+@CallerSensitive
 public double getDouble(Object obj)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 return getFieldAccessor(obj).getDouble(obj);
 }
 /**
 * Sets the field represented by this {@code Field} object on the
 * @exception NullPointerException      if the specified object is null
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 */
+@CallerSensitive
 public void set(Object obj, Object value)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).set(obj, value);
 }
 /**
 * Sets the value of a field as a {@code boolean} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setBoolean(Object obj, boolean z)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setBoolean(obj, z);
 }
 /**
 * Sets the value of a field as a {@code byte} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setByte(Object obj, byte b)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setByte(obj, b);
 }
 /**
 * Sets the value of a field as a {@code char} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setChar(Object obj, char c)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setChar(obj, c);
 }
 /**
 * Sets the value of a field as a {@code short} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setShort(Object obj, short s)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setShort(obj, s);
 }
 /**
 * Sets the value of a field as an {@code int} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setInt(Object obj, int i)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setInt(obj, i);
 }
 /**
 * Sets the value of a field as a {@code long} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setLong(Object obj, long l)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setLong(obj, l);
 }
 /**
 * Sets the value of a field as a {@code float} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setFloat(Object obj, float f)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setFloat(obj, f);
 }
 /**
 * Sets the value of a field as a {@code double} on the specified object.
 *              and the field is an instance field.
 * @exception ExceptionInInitializerError if the initialization provoked
 *              by this method fails.
 * @see       Field#set
 */
+@CallerSensitive
 public void setDouble(Object obj, double d)
 throws IllegalArgumentException, IllegalAccessException
 {
+if (!override) {
+if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
+Class<?> caller = Reflection.getCallerClass();
+checkAccess(caller, clazz, obj, modifiers);
+}
+}
 getFieldAccessor(obj).setDouble(obj, d);
 }
-// Convenience routine which performs security checks
+// security check is done before calling this method
 private FieldAccessor getFieldAccessor(Object obj)
 throws IllegalAccessException
 {
-doSecurityCheck(obj);
 boolean ov = override;
-FieldAccessor a = (ov)? overrideFieldAccessor : fieldAccessor;
+FieldAccessor a = (ov) ? overrideFieldAccessor : fieldAccessor;
-return (a != null)? a : acquireFieldAccessor(ov);
+return (a != null) ? a : acquireFieldAccessor(ov);
 }
 // NOTE that there is no synchronization used here. It is correct
 // (though not efficient) to generate more than one FieldAccessor
 // for a given Field. However, avoiding synchronization will
 if (root != null) {
 root.setFieldAccessor(accessor, overrideFinalCheck);
 }
 }
-// NOTE: be very careful if you change the stack depth of this
-// routine. The depth of the "getCallerClass" call is hardwired so
-// that the compiler can have an easier time if this gets inlined.
-private void doSecurityCheck(Object obj) throws IllegalAccessException {
-if (!override) {
-if (!Reflection.quickCheckMemberAccess(clazz, modifiers)) {
-Class<?> caller = Reflection.getCallerClass(4);
-checkAccess(caller, clazz, obj, modifiers);
-}
-}
-}
 /**
 * @throws NullPointerException {@inheritDoc}
 * @since 1.5
 */
 public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {

changeset 16906	44dfee24cb71
parent 16743	b0b34102bb4c
child 17450	0f704861915e