# HG changeset patch # User Björn Ricks # Date 1350394832 -7200 # Node ID 59beb6651ee6ed7ed3d4af8f7240154760caa1ed # Parent 92021091b03de1a92d3f9e21c02ba6f363fd75a2 Avoid NullPointerException if help text is null. diff -r 92021091b03d -r 59beb6651ee6 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Tue Oct 16 14:42:51 2012 +0200 +++ b/flys-artifacts/ChangeLog Tue Oct 16 15:40:32 2012 +0200 @@ -1,3 +1,8 @@ +2012-10-16 Björn Ricks + + * src/main/java/de/intevation/flys/artifacts/states/DefaultState.java: + Avoid NullPointerException if help text is null. + 2012-10-16 Ingo Weinzierl flys/issue930 diff -r 92021091b03d -r 59beb6651ee6 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java Tue Oct 16 14:42:51 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java Tue Oct 16 15:40:32 2012 +0200 @@ -73,7 +73,9 @@ CallMeta meta = context.getMeta(); - String helpText = Resources.getMsg(meta, getHelpText(), getHelpText()); + String helpText = getHelpText() != null ? + Resources.getMsg(meta, getHelpText(), getHelpText()) + : null; String label = Resources.getMsg(meta, getID(), getID()); Element ui = ProtocolUtils.createArtNode(