From 35f00592e6c1b756b642ad4329a9a14314b80fe1 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 25 Sep 2012 09:14:44 +0300
Subject: Map PortalDefaultWidgetSet -> DefaultWidgetSet when source is portal
 (#9731)

---
 server/src/com/vaadin/server/VaadinPortletService.java | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'server')

diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index 02974aeea5..8025fa7713 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -51,6 +51,13 @@ public class VaadinPortletService extends VaadinService {
             // portal property
             widgetset = VaadinPortletRequest.cast(request).getPortalProperty(
                     VaadinPortlet.PORTAL_PARAMETER_VAADIN_WIDGETSET);
+            if ("com.vaadin.portal.gwt.PortalDefaultWidgetSet"
+                    .equals(widgetset)) {
+                // For backwards compatibility - automatically map old portal
+                // default widget set to default widget set
+                widgetset = VaadinPortlet.DEFAULT_WIDGETSET;
+
+            }
         }
 
         if (widgetset == null) {
-- 
cgit v1.2.3