From 3526c17fb3e283d4560f4047bdc3a059a584f6bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 18 Sep 2009 10:29:39 +0200
Subject: [PATCH] ItEr26S03ContornaItEr25S03: Fixing problem at error page and
 not found page. It's needed to retrieve the I18n

---
 .../org/navalplanner/web/error/PageForErrorOnEvent.java     | 6 ++++--
 navalplanner-webapp/src/main/webapp/common/error.zul        | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
index bfd737e02..0b7d555c3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
@@ -20,8 +20,10 @@ public class PageForErrorOnEvent extends GenericForwardComposer {
         super.doAfterCompose(comp);
         logError();
         modalWindow = comp;
-        I18n fellow = (I18n) modalWindow.getFellow("message");
-        fellow.forceLoad();
+        I18n i18NMessge = (I18n) modalWindow.getFellowIfAny("message");
+        if (i18NMessge != null) {
+            i18NMessge.forceLoad();
+        }
     }
 
     private void logError() {
diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul
index 0c53a0a0f..9ce0cfa05 100644
--- a/navalplanner-webapp/src/main/webapp/common/error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/error.zul
@@ -9,7 +9,8 @@
         </caption-->
         <vbox apply="org.navalplanner.web.error.PageForErrorOnEvent"
             sclass="errorbox">
-            <i18n value="Run-time error: {0} . Error was registered and it&#039;ll be fixed as soon as possible." arg0="${requestScope['javax.servlet.error.message']}" />
+            <i18n id="message"
+            value="Run-time error: {0} . Error was registered and it&#039;ll be fixed as soon as possible." arg0="${requestScope['javax.servlet.error.message']}" />
             <hbox style="margin-left:auto; margin-right:auto">
                 <button id="reload" label="${i18n:_('Reload')}" />
                 <button id="quitSession" label="${i18n:_('Exit session')}"></button>