Merged changes from 6.6 to 6.7

svn changeset:20625/svn branch:6.7

1 files changed, 10 insertions, 2 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
index dd5d61ea57..aba772a26e 100644
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
@@ -107,8 +107,16 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
 
     public static PortletApplicationContext2 getApplicationContext(
             PortletSession session) {
-        PortletApplicationContext2 cx = (PortletApplicationContext2) session
-                .getAttribute(PortletApplicationContext2.class.getName());
+        Object cxattr = session.getAttribute(PortletApplicationContext2.class
+                .getName());
+        PortletApplicationContext2 cx = null;
+        // can be false also e.g. if old context comes from another
+        // classloader when using
+        // <private-session-attributes>false</private-session-attributes>
+        // and redeploying the portlet - see #7461
+        if (cxattr instanceof PortletApplicationContext2) {
+            cx = (PortletApplicationContext2) cxattr;
+        }
         if (cx == null) {
             cx = new PortletApplicationContext2();
             session.setAttribute(PortletApplicationContext2.class.getName(), cx);