From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 16 Nov 2009 14:27:57 +0000 (+0000)
Subject: fixes #3712. Bit ugly fix but most likely nobody knows about XML type error messages
X-Git-Tag: 6.7.0.beta1~2293
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f10aa3fcba971defc4503d0e24250edd0ede660f;p=vaadin-framework.git

fixes #3712. Bit ugly fix but most likely nobody knows about XML type error messages

svn changeset:9819/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java b/src/com/vaadin/terminal/gwt/client/VErrorMessage.java
index ba25dd23db..ba5d5a9d24 100644
--- a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java
+++ b/src/com/vaadin/terminal/gwt/client/VErrorMessage.java
@@ -30,13 +30,18 @@ public class VErrorMessage extends FlowPanel {
                 if (child instanceof String) {
                     final String errorMessage = (String) child;
                     add(new HTML(errorMessage));
-                } else if (child instanceof UIDL.XML) {
-                    final UIDL.XML xml = (UIDL.XML) child;
-                    add(new HTML(xml.getXMLAsString()));
                 } else {
-                    final VErrorMessage childError = new VErrorMessage();
-                    add(childError);
-                    childError.updateFromUIDL((UIDL) child);
+                    try {
+                        final VErrorMessage childError = new VErrorMessage();
+                        childError.updateFromUIDL((UIDL) child);
+                        add(childError);
+                    } catch (Exception e) {
+                        // TODO XML type error, check if this can even happen
+                        // anymore??
+                        final UIDL.XML xml = (UIDL.XML) child;
+                        add(new HTML(xml.getXMLAsString()));
+
+                    }
                 }
             }
         }