--- a/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java	Thu Apr 22 12:58:44 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java	Fri Apr 23 07:55:05 2010 +0000
@@ -15,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -63,6 +64,10 @@
             SessionModel sm = SessionModelFactory.getInstance()
                     .getSessionModel(request);
             ArtifactDescription ad = sm.getArtifactDescription();
+
+            Locale tmp    = sm.getCurrentLocale();
+            Locale locale = tmp != null ? tmp : request.getLocale();
+
             if (ad != null){
                 Collection<String> inputParameter = ad.getInputParameter();
                 Collection<InputParameter> ips = null;
@@ -77,8 +82,8 @@
                     }
                 }
                 ArtifactDatabaseClient adc = ArtifactDatabaseClientFactory
-                                                    .getInstance()
-                                                    .getArtifactDatabaseClient(getLocale(request));
+                    .getInstance().getArtifactDatabaseClient(locale);
+
                 Map outs = ad.getOutputModes();
                 if (outs == null || outs.isEmpty()) {
                     // TODO: Woher kommt der zu erreichende Status;
@@ -103,8 +108,6 @@
                         );
                     }
                     catch (ArtifactDatabaseInputException e) {
-                        log.debug("================ CATCH ME ======================");
-                        log.debug("===== ERROR MSG: " + e.getMessage());
                         log.error(e, e);
                         request.setAttribute(
                             CommunicationKeys.REQUEST_EXCEPTION_INPUT_ID,