Changeset 6090 for trunk

Timestamp:

12/06/11 12:19:39 (6 months ago)

Author:

mtld

Message:

reset non-matching page alternative keys

Location:

trunk/pustefix-core/src/main/java

Files:

• de/schlund/pfixcore/workflow/SiteMap.java (modified) (1 diff)
• de/schlund/pfixcore/workflow/context/RequestContextImpl.java (modified) (1 diff)
• org/pustefixframework/http/PustefixContextXMLRequestHandler.java (modified) (1 diff)

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/SiteMap.java

@@ -329 +329 @@
     
     public Set<String> getPageAlternativeKeys(String pageName) {
-        Page page = pageNameToPage.get(pageName);
-        if(page != null && page.pageAltKeyToName.size() > 0) {
-            return page.pageAltKeyToName.keySet();
+        if(pageName != null) {
+            Page page = pageNameToPage.get(pageName);
+            if(page != null && page.pageAltKeyToName.size() > 0) {
+                return page.pageAltKeyToName.keySet();
+            }
         }
         return null;

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/workflow/context/RequestContextImpl.java

@@ -534 +534 @@
             }
             if(pageAlternativeKey != null) {
-                spdoc.setPageAlternative(pageAlternativeKey);
+                spdoc.setPageAlternative(getPageAlternative());
             }
             

trunk/pustefix-core/src/main/java/org/pustefixframework/http/PustefixContextXMLRequestHandler.java

@@ -231 +231 @@
             
             if(spdoc != null && !spdoc.isRedirect()) {
+                if(spdoc.getPageAlternative() != null) {
+                    Set<String> pageAltKeys = siteMap.getPageAlternativeKeys(spdoc.getPagename());
+                    if(pageAltKeys == null || !pageAltKeys.contains(spdoc.getPageAlternative())) {
+                        spdoc.setPageAlternative(null);
+                    }
+                }
                 String expectedPageName = null;
                 String langPrefix = null;