From 8ce6d56f1a614f9dfa85a22da13f66df470c67fc Mon Sep 17 00:00:00 2001 From: daidai_is_here Date: Fri, 28 Feb 2020 16:23:04 +0800 Subject: [PATCH] modify patch --- 0001-ParseValues-NullPointerException-patch.patch | 7 ++++--- beust-jcommander.spec | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/0001-ParseValues-NullPointerException-patch.patch b/0001-ParseValues-NullPointerException-patch.patch index 5cf6873..1a7e39b 100644 --- a/0001-ParseValues-NullPointerException-patch.patch +++ b/0001-ParseValues-NullPointerException-patch.patch @@ -34,7 +34,9 @@ index 3264008..e937a66 100644 + } catch(NoSuchFieldException ex) { + Class clazz = object.getClass(); + Field found = null; -+ while (clazz != null && method.getDeclaringClass().isAssignableFrom(clazz)) { + try { + found = clazz.getDeclaredField(fieldName); ++ while (clazz != null && method.getDeclaringClass().isAssignableFrom(clazz)) { ++ try { ++ found = clazz.getDeclaredField(fieldName); + } catch (NoSuchFieldException nfex) { + // ignore + } @@ -55,5 +57,4 @@ index 3264008..e937a66 100644 } return result; -- -2.7.4 - +2.7.4 \ No newline at end of file diff --git a/beust-jcommander.spec b/beust-jcommander.spec index d4d5c15..dfe4d48 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,6 +1,6 @@ Name: beust-jcommander Version: 1.71 -Release: 6 +Release: 7 Summary: Java framework for parsing command line parameters License: ASL 2.0 URL: http://jcommander.org/ @@ -44,5 +44,8 @@ sed -i 's/@VERSION@/%{version}/g' pom.xml %files help -f .mfiles-javadoc %changelog +* Fri Feb 28 2020 daiqianwen - 1.71-7 +- Modify patch + * Wed Feb 12 2020 Shuaishuai Song - 1.71-6 - Package init