From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 10 Feb 2010 20:35:26 +0000 (+0000)
Subject: Merged [11258] from 6.2 for #3974
X-Git-Tag: 6.7.0.beta1~2052
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=87102e2ed9d2daf6ed4e2141cc1c3bef6262ad43;p=vaadin-framework.git

Merged [11258] from 6.2 for #3974

svn changeset:11259/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 39f4e845f7..060c4dedf1 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -148,6 +148,7 @@ public class ApplicationConfiguration {
         int lastdot = module.lastIndexOf(".");
         String base = module.substring(0, lastdot);
         String simpleName = module.substring(lastdot + 1);
+        // TODO figure out (ask around) WTF this is almost-removed
         // if (!wsname.startsWith(base) || !wsname.endsWith(simpleName)) {
         // // WidgetSet module name does not match implementation name;
         // // probably inherited WidgetSet with entry-point. Skip.
@@ -161,7 +162,7 @@ public class ApplicationConfiguration {
             String msg = "Tried to init " + widgetset.getClass().getName()
                     + ", but " + initedWidgetSet.getClass().getName()
                     + " was already inited.";
-            ApplicationConnection.getConsole().log(msg);
+            throw new IllegalStateException(msg);
         }
         initedWidgetSet = widgetset;
         ArrayList<String> appIds = new ArrayList<String>();
diff --git a/src/com/vaadin/terminal/gwt/client/DefaultWidgetSet.java b/src/com/vaadin/terminal/gwt/client/DefaultWidgetSet.java
index 919c267eb0..feefdc7421 100644
--- a/src/com/vaadin/terminal/gwt/client/DefaultWidgetSet.java
+++ b/src/com/vaadin/terminal/gwt/client/DefaultWidgetSet.java
@@ -37,7 +37,14 @@ public class DefaultWidgetSet implements WidgetSet {
      * This is the entry point method. It will start the first
      */
     public void onModuleLoad() {
-        ApplicationConfiguration.initConfigurations(this);
+        try {
+            ApplicationConfiguration.initConfigurations(this);
+        } catch (Exception e) {
+            // Log & don't continue;
+            // custom WidgetSets w/ entry points will cause this
+            ApplicationConnection.getConsole().log(e.getMessage());
+            return;
+        }
         ApplicationConfiguration.startNextApplication(); // start first app
         map = GWT.create(WidgetMap.class);
     }