[MMBASE SCM] r42539 - CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search

[fpunt]

Author: fpunt
Date: 2010-06-14 09:42:45 +0200 (Mon, 14 Jun 2010)
New Revision: 42539

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
   
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
Log:
[CMSC-1703]

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
 2010-06-11 15:47:53 UTC (rev 42538)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/RedirectServlet.java
 2010-06-14 07:42:45 UTC (rev 42539)
@@ -105,7 +105,11 @@
             }
 
             if (pageInfo != null) {
-                PortalURL u = new PortalURL(pageInfo.getHost(), request, 
pageInfo.getPath());
+                String host = null;
+                if(ServerUtil.useServerName()) {
+                        host = pageInfo.getHost();
+                }
+                PortalURL u = new PortalURL(host, request, pageInfo.getPath());
                 String elementId = String.valueOf(node.getNumber());
                 // When contentelement and the same number then it is a 
contentportlet
                 if (! ( "contentelement".equals(pageInfo.getParametername())

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
 2010-06-11 15:47:53 UTC (rev 42538)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/search/src/java/com/finalist/cmsc/services/search/SearchServiceMMBaseImpl.java
 2010-06-14 07:42:45 UTC (rev 42539)
@@ -319,10 +319,7 @@
              }
          }
 
-         String host = null;
-         if (ServerUtil.useServerName()) {
-            host = SiteManagement.getSite(page);
-         }
+         String host = SiteManagement.getSite(page);
 
          String pagePath = SiteManagement.getPath(page, 
!ServerUtil.useServerName());
          Layout layout = SiteManagement.getLayout(page.getLayout());

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs