getDeclaredField raises exception instead of returning null when fiel…

…d isn't found (cherry picked from commit 348d873)
kingkaki · Jan 30, 2019 · 04c198a · 04c198a
1 parent 6ba90d2
commit 04c198a
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/ysoserial/payloads/util/Reflections.java b/src/main/java/ysoserial/payloads/util/Reflections.java
@@ -9,12 +9,16 @@
 @SuppressWarnings ( "restriction" )
 public class Reflections {
 
-	public static Field getField(final Class<?> clazz, final String fieldName) throws Exception {
-		Field field = clazz.getDeclaredField(fieldName);
-		if (field != null)
-			field.setAccessible(true);
-		else if (clazz.getSuperclass() != null)
-			field = getField(clazz.getSuperclass(), fieldName);
+	public static Field getField(final Class<?> clazz, final String fieldName) {
+        Field field = null;
+	    try {
+	        field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+        }
+        catch (NoSuchFieldException ex) {
+            if (clazz.getSuperclass() != null)
+                field = getField(clazz.getSuperclass(), fieldName);
+        }
 		return field;
 	}