Merge from 5.3 to 6.0:

[7128] Fixes to merge tool.
[7129] Merge from branches/manual_2009_03 to versions/5.3 (multiple changesets)
[7131] Fixed language problems in the section on layout cell spacing.
[7132] Use 24 hour format instead of 12 hour for Eclipse Manual plugin timestamp.

svn changeset:7169/svn branch:6.0

2 files changed, 4 insertions, 2 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
index 2321e50051..bada4af66f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/ApplicationServlet.java
@@ -577,7 +577,8 @@ public class ApplicationServlet extends HttpServlet {
                         .getInternalErrorCaption(), ci
                         .getInternalErrorMessage(), ci.getInternalErrorURL());
                 if (application != null) {
-                    application.terminalError(new RequestError(e));
+                    application.getErrorHandler().terminalError(
+                            new RequestError(e));
                 } else {
                     throw new ServletException(e);
                 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
index 16281a3c8a..5cb8405d2a 100644
--- a/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java
@@ -1473,7 +1473,8 @@ public class CommunicationManager implements Paintable.RepaintRequestListener {
             }
 
         } catch (final Throwable t) {
-            application.terminalError(new URIHandlerErrorImpl(application, t));
+            application.getErrorHandler().terminalError(
+                    new URIHandlerErrorImpl(application, t));
             return null;
         }
     }