changeset 4155:59beb6651ee6

Avoid NullPointerException if help text is null.
author Björn Ricks <bjoern.ricks@intevation.de>
date Tue, 16 Oct 2012 15:40:32 +0200 (2012-10-16)
parents 92021091b03d
children 529d0e61e70d
files flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DefaultState.java
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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	<bjoern.ricks@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/DefaultState.java:
+	  Avoid NullPointerException if help text is null.
+
 2012-10-16  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue930
--- 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(

http://dive4elements.wald.intevation.org