sonar fixes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1706648 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 7 deletions

diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
index 26331fbccf..1d957e5a59 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
@@ -559,20 +559,18 @@ public final class PackagePropertiesPart extends PackagePart implements
 	 * @throws InvalidFormatException
 	 *             Throws if the date format isnot valid.
 	 */
-	private Nullable<Date> setDateValue(String s) throws InvalidFormatException {
-		if (s == null || s.equals("")) {
+	private Nullable<Date> setDateValue(String dateStr) throws InvalidFormatException {
+		if (dateStr == null || dateStr.equals("")) {
 			return new Nullable<Date>();
 		}
-		if (!s.endsWith("Z")) {
-		    s += "Z";
-		}
+		String dateTzStr = dateStr.endsWith("Z") ? dateStr : (dateStr + "Z");
 		SimpleDateFormat df = new SimpleDateFormat(DEFAULT_DATEFORMAT, Locale.ROOT);
 		df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-		Date d = df.parse(s, new ParsePosition(0));
+		Date d = df.parse(dateTzStr, new ParsePosition(0));
 		if (d == null) {
 		    df = new SimpleDateFormat(ALTERNATIVE_DATEFORMAT, Locale.ROOT);
 		    df.setTimeZone(LocaleUtil.TIMEZONE_UTC);
-		    d = df.parse(s, new ParsePosition(0));
+		    d = df.parse(dateTzStr, new ParsePosition(0));
 		}
 		if (d == null) {
 			throw new InvalidFormatException("Date not well formated");