From 7314034fc9b96fd34cf3d54fe00650845e0373ad Mon Sep 17 00:00:00 2001 From: Eric Milles Date: Wed, 6 Aug 2025 14:03:01 -0500 Subject: [PATCH] IVY-1659: fix for `NullPointerException` --- META-INF/MANIFEST.MF | 2 +- src/java/org/apache/ivy/util/PropertiesFile.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index bc95c932e..ae4c69453 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -106,7 +106,7 @@ Export-Package: org.apache.ivy;version="2.0.0", org.apache.ivy.plugins.trigger;version="2.0.0", org.apache.ivy.plugins.version;version="2.0.0", org.apache.ivy.tools.analyser;version="2.0.0", - org.apache.ivy.util;version="2.0.0", + org.apache.ivy.util;version="2.6.0", org.apache.ivy.util.cli;version="2.0.0", org.apache.ivy.util.extendable;version="2.0.0", org.apache.ivy.util.filter;version="2.0.0", diff --git a/src/java/org/apache/ivy/util/PropertiesFile.java b/src/java/org/apache/ivy/util/PropertiesFile.java index e3d54fca6..0ca93c85a 100644 --- a/src/java/org/apache/ivy/util/PropertiesFile.java +++ b/src/java/org/apache/ivy/util/PropertiesFile.java @@ -24,10 +24,11 @@ import java.util.Properties; /** - * A simple Properties extension easing the loading and saving of data + * A simple Properties extension easing the loading and saving of data. */ @SuppressWarnings("serial") public class PropertiesFile extends Properties { + private File file; private String header; @@ -73,4 +74,8 @@ public void save() { } } + @Override + public Object setProperty(String key, String value) { + return (value == null) ? remove(key) : super.setProperty(key, value); + } }