|
 |
60ad7d |
From 2b813829d02b89206493520eb86075a43b145db9 Mon Sep 17 00:00:00 2001
|
|
|
60ad7d |
From: Roman Vais <rvais@redhat.com>
|
|
|
60ad7d |
Date: Tue, 13 Jun 2017 13:24:24 +0200
|
|
|
60ad7d |
Subject: [PATCH] ParseValues-NullPointerException-patch
|
|
|
60ad7d |
|
|
|
60ad7d |
---
|
|
|
60ad7d |
.../java/com/beust/jcommander/Parameterized.java | 27 ++++++++++++++++++++--
|
|
|
60ad7d |
1 file changed, 25 insertions(+), 2 deletions(-)
|
|
|
60ad7d |
|
|
|
60ad7d |
diff --git a/src/main/java/com/beust/jcommander/Parameterized.java b/src/main/java/com/beust/jcommander/Parameterized.java
|
|
|
60ad7d |
index 3264008..e937a66 100644
|
|
|
60ad7d |
--- a/src/main/java/com/beust/jcommander/Parameterized.java
|
|
|
60ad7d |
+++ b/src/main/java/com/beust/jcommander/Parameterized.java
|
|
|
60ad7d |
@@ -13,6 +13,8 @@ import java.lang.reflect.Type;
|
|
|
60ad7d |
import java.util.Collections;
|
|
|
60ad7d |
import java.util.List;
|
|
|
60ad7d |
import java.util.Set;
|
|
|
60ad7d |
+import java.util.logging.Level;
|
|
|
60ad7d |
+import java.util.logging.Logger;
|
|
|
60ad7d |
|
|
|
60ad7d |
/**
|
|
|
60ad7d |
* Encapsulate a field or a method annotated with @Parameter or @DynamicParameter
|
|
|
60ad7d |
@@ -180,12 +182,33 @@ public class Parameterized {
|
|
|
60ad7d |
String fieldName = Character.toLowerCase(name.charAt(3)) + name.substring(4);
|
|
|
60ad7d |
Object result = null;
|
|
|
60ad7d |
try {
|
|
|
60ad7d |
- Field field = method.getDeclaringClass().getDeclaredField(fieldName);
|
|
|
60ad7d |
+ Field field = object.getClass().getDeclaredField(fieldName);
|
|
|
60ad7d |
if (field != null) {
|
|
|
60ad7d |
setFieldAccessible(field);
|
|
|
60ad7d |
result = field.get(object);
|
|
|
60ad7d |
}
|
|
|
60ad7d |
- } catch(NoSuchFieldException | IllegalAccessException ex) {
|
|
|
60ad7d |
+ } catch(NoSuchFieldException ex) {
|
|
|
60ad7d |
+ Class clazz = object.getClass();
|
|
|
60ad7d |
+ Field found = null;
|
|
|
60ad7d |
+ while (clazz != null && method.getDeclaringClass().isAssignableFrom(clazz)) {
|
|
|
60ad7d |
+ try {
|
|
|
60ad7d |
+ found = clazz.getDeclaredField(fieldName);
|
|
|
60ad7d |
+ } catch (NoSuchFieldException nfex) {
|
|
|
60ad7d |
+ // ignore
|
|
|
60ad7d |
+ }
|
|
|
60ad7d |
+ if (found != null) break;
|
|
|
60ad7d |
+ clazz = clazz.getSuperclass();
|
|
|
60ad7d |
+ }
|
|
|
60ad7d |
+ if (found != null) {
|
|
|
60ad7d |
+ setFieldAccessible(found);
|
|
|
60ad7d |
+ try {
|
|
|
60ad7d |
+ result = found.get(object);
|
|
|
60ad7d |
+ } catch (IllegalAccessException iex) {
|
|
|
60ad7d |
+ // ignore
|
|
|
60ad7d |
+ }
|
|
|
60ad7d |
+ }
|
|
|
60ad7d |
+
|
|
|
60ad7d |
+ } catch(IllegalAccessException ex) {
|
|
|
60ad7d |
// ignore
|
|
|
60ad7d |
}
|
|
|
60ad7d |
return result;
|
|
|
60ad7d |
--
|
|
|
60ad7d |
2.7.4
|
|
|
60ad7d |
|