From f0c7ab7b951212460466c9f60eb7b2f628bf3f59 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Mon, 7 Feb 2011 19:02:19 +0000 Subject: [PATCH] The test for an unrecognized literal type was in a place where it could only throw a NullPointerException --- .../webapp/web/jsptags/InputElementFormattingTag.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java index f5e469666..fa708a3e6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java @@ -1114,7 +1114,12 @@ public class InputElementFormattingTag extends TagSupport { } else if ( valueFromLiteral instanceof XSDDateTime) { strFromLit = date.getLexicalForm(); log.debug("found existing literal of type XSDDateTime for field " + fieldName); + } else { + log.error("found an existing value for field " + fieldName + + "but it was not a String or Date:" + + valueFromLiteral.getClass().getName()); } + if( dateFromLit != null ){ dt = new DateTime(dateFromLit); }else{ @@ -1122,9 +1127,6 @@ public class InputElementFormattingTag extends TagSupport { //dt = new DateTime( dtFmt.parseDateTime(strFromLit) ); dt = new DateTime( strFromLit ); } - } else { - log.error("found an existing value from the editConfig but it was not a String or Date:"); - log.error(valueFromLiteral.getClass().getName()); } }else{ //No EditSubmission found, try to get default value from EditConfig