aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Gregory <garydgregory@gmail.com>2023-01-10 11:25:31 -0500
committerGary Gregory <garydgregory@gmail.com>2023-01-10 11:25:31 -0500
commit302d697f9b8eff0cd453626dd57b467ed9650061 (patch)
tree9b7b56a88206bb340a5698034bb9b19e2fc1006a
parentfa383f5c5760a6e73ed04f98249c32fdff296ebf (diff)
downloadapache-commons-lang-302d697f9b8eff0cd453626dd57b467ed9650061.tar.gz
Pick up maven-javadoc-plugin version from parent POM
-rw-r--r--pom.xml1
-rw-r--r--src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java4
2 files changed, 3 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 49fb26021..b866cf67e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,7 +634,6 @@
<jmh.version>1.36</jmh.version>
<uberjar.name>benchmarks</uberjar.name>
- <commons.javadoc.version>3.4.1</commons.javadoc.version>
<commons.japicmp.version>0.16.0</commons.japicmp.version>
<commons.pmd.version>3.19.0</commons.pmd.version>
<commons.pmd-impl.version>6.52.0</commons.pmd-impl.version>
diff --git a/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
index 1688c31e4..bc80d907e 100644
--- a/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
+++ b/src/main/java/org/apache/commons/lang3/time/DateFormatUtils.java
@@ -21,6 +21,8 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.commons.lang3.ObjectUtils;
+
/**
* Date and time formatting utilities and constants.
*
@@ -409,7 +411,7 @@ public class DateFormatUtils {
}
private static TimeZone getTimeZone(final Calendar calendar) {
- return calendar == null ? null : calendar.getTimeZone();
+ return ObjectUtils.get(calendar, Calendar::getTimeZone);
}
}