[MMBASE SCM] r42491 - CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib

[fpunt]

Author: fpunt
Date: 2010-06-09 16:37:48 +0200 (Wed, 09 Jun 2010)
New Revision: 42491

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
Log:
[CMSC-1701]

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
    2010-06-09 13:59:59 UTC (rev 42490)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
    2010-06-09 14:37:48 UTC (rev 42491)
@@ -76,10 +76,12 @@
             }
             if(!ServerUtil.useServerName()) {
                PortalEnvironment env = 
PortalEnvironment.getPortalEnvironment((HttpServletRequest)pageContext.getRequest());
-               PortalURL currentURL = env.getRequestedPortalURL();
-               String path = currentURL.getGlobalNavigationAsString();
-               String server = (path.indexOf("/") != -1)?(path.substring(0, 
path.indexOf("/"))):path;
-               url += "?server="+server;
+               if(env != null) {
+                      PortalURL currentURL = env.getRequestedPortalURL();
+                      String path = currentURL.getGlobalNavigationAsString();
+                      String server = (path.indexOf("/") != 
-1)?(path.substring(0, path.indexOf("/"))):path;
+                       url += "?server="+server;
+               }
             }
          }
       }

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