see 01/17 log

Blankj · Blankj · commit 4b5d0852f827 · 2018-01-17T14:49:36.000+08:00
diff --git a/utilcode/src/main/java/com/blankj/utilcode/util/ReflectUtils.java b/utilcode/src/main/java/com/blankj/utilcode/util/ReflectUtils.java
@@ -198,7 +198,7 @@ private ReflectUtils newInstance(final Constructor<?> constructor, final Object.
      */
     public ReflectUtils field(final String name) {
         try {
-            Field field = getAccessibleField(name);
+            Field field = getField(name);
             return new ReflectUtils(field.getType(), field.get(object));
         } catch (IllegalAccessException e) {
             throw new ReflectException(e);
@@ -214,20 +214,29 @@ public ReflectUtils field(final String name) {
      */
     public ReflectUtils field(String name, Object value) {
         try {
-            Field field = getAccessibleField(name);
-            if ((field.getModifiers() & Modifier.FINAL) == Modifier.FINAL) {
-                Field modifiersField = Field.class.getDeclaredField("modifiers");
-                modifiersField.setAccessible(true);
-                modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-            }
+            Field field = getField(name);
             field.set(object, unwrap(value));
             return this;
         } catch (Exception e) {
             throw new ReflectException(e);
         }
     }
 
-    private Field getAccessibleField(String name) throws ReflectException {
+    private Field getField(String name) throws IllegalAccessException {
+        Field field = getAccessibleField(name);
+        if ((field.getModifiers() & Modifier.FINAL) == Modifier.FINAL) {
+            try {
+                Field modifiersField = Field.class.getDeclaredField("modifiers");
+                modifiersField.setAccessible(true);
+                modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+            } catch (NoSuchFieldException ignore) {
+                // runs in android will happen
+            }
+        }
+        return field;
+    }
+
+    private Field getAccessibleField(String name) {
         Class<?> type = type();
         try {
             return accessible(type.getField(name));
@@ -238,8 +247,7 @@ private Field getAccessibleField(String name) throws ReflectException {
                 } catch (NoSuchFieldException ignore) {
                 }
                 type = type.getSuperclass();
-            }
-            while (type != null);
+            } while (type != null);
             throw new ReflectException(e);
         }
     }
diff --git a/utilcode/src/test/java/com/blankj/utilcode/util/reflect/ReflectUtilsTest.java b/utilcode/src/test/java/com/blankj/utilcode/util/reflect/ReflectUtilsTest.java
@@ -383,6 +383,9 @@ public void fieldFinal() throws Exception {
 
     @Test
     public void fieldPrivateStaticFinal() throws Exception {
+        assertEquals(1, ReflectUtils.reflect(TestPrivateStaticFinal.class).field("I1").get());
+        assertEquals(1, ReflectUtils.reflect(TestPrivateStaticFinal.class).field("I2").get());
+
         ReflectUtils.reflect(TestPrivateStaticFinal.class).field("I1", 2);
         ReflectUtils.reflect(TestPrivateStaticFinal.class).field("I2", 2);
 
diff --git a/utilcode/src/test/java/com/blankj/utilcode/util/reflect/TestPrivateStaticFinal.java b/utilcode/src/test/java/com/blankj/utilcode/util/reflect/TestPrivateStaticFinal.java
@@ -9,10 +9,6 @@
  * </pre>
  */
 public class TestPrivateStaticFinal {
-    private static final int I1;
+    private static final int     I1 = new Integer(1);
     private static final Integer I2 = new Integer(1);
-
-    static {
-        I1 = new Integer(1);
-    }
 }
