# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1272284915 0
# Node ID 0aeac0fe5db292eed88d76574c3c747a11671de4
# Parent  21735fb8d29bfd9c1db1ee6521e9de00b1911fca
Fixed broken error messages that are displayed if the artifact server is down (issue236, issue242).

gnv/trunk@986 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 21735fb8d29b -r 0aeac0fe5db2 gnv/ChangeLog
--- a/gnv/ChangeLog	Mon Apr 26 10:32:22 2010 +0000
+++ b/gnv/ChangeLog	Mon Apr 26 12:28:35 2010 +0000
@@ -1,3 +1,11 @@
+2010-04-26  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	  Issue236 & Issue242
+
+	* src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java,
+	  src/main/java/de/intevation/gnv/action/DescribeUIAction.java: Display
+	  error messages if the artifact server is down - this have been broken.
+
 2010-04-26  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	  Issue258
diff -r 21735fb8d29b -r 0aeac0fe5db2 gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java
--- a/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java	Mon Apr 26 10:32:22 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java	Mon Apr 26 12:28:35 2010 +0000
@@ -7,6 +7,7 @@
 import de.intevation.gnv.artifactdatabase.client.ArtifactDatabaseClientFactory;
 
 import de.intevation.gnv.artifactdatabase.objects.ArtifactDescription;
+import de.intevation.gnv.artifactdatabase.objects.ArtifactObject;
 
 import de.intevation.gnv.propertiesreader.PropertiesReader;
 import de.intevation.gnv.propertiesreader.PropertiesReaderFactory;
@@ -80,10 +81,20 @@
             ArtifactDatabaseClient adc = ArtifactDatabaseClientFactory
                 .getInstance().getArtifactDatabaseClient(locale);
             request.getSession().setAttribute(Globals.LOCALE_KEY, locale);
+            ArtifactObject artifactFactory = sm.getSelectedArtifactFactory();
+
+            if (artifactFactory == null) {
+                logger.error("No connection to artifact server.");
+                request.setAttribute(
+                    CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID,
+                    "java.io.ioexception..connection.refused");
+
+                return super.getExceptionForward(mapping);
+            }
 
             ArtifactDescription artifactDescription =
                 adc.getCurrentStepDescription(
-                    sm.getSelectedArtifactFactory(),
+                    artifactFactory,
                     sm.getCurrentArtifact(),
                     true);
 
diff -r 21735fb8d29b -r 0aeac0fe5db2 gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java
--- a/gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java	Mon Apr 26 10:32:22 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/FetchArtifactFactoriesAction.java	Mon Apr 26 12:28:35 2010 +0000
@@ -60,7 +60,7 @@
         catch (ArtifactDatabaseClientException e) {
             log.error(e, e);
             request.setAttribute(
-                CommunicationKeys.REQUEST_EXCEPTION_INPUT_ID,
+                CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID,
                 e.getMessage());
 
             return super.getExceptionForward(mapping);