[MMBASE CVS] contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect LanguageRedirectServlet.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect
In directory 
james.mmbase.org:/tmp/cvs-serv14889/language-redirect/src/java/com/finalist/cmsc/languageredirect

Modified Files:
        LanguageRedirectServlet.java 
Log Message:
Additional NPE check and send an error to the user


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect


Index: LanguageRedirectServlet.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/language-redirect/src/java/com/finalist/cmsc/languageredirect/LanguageRedirectServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- LanguageRedirectServlet.java        16 May 2008 11:45:45 -0000      1.7
+++ LanguageRedirectServlet.java        26 Jun 2008 09:04:10 -0000      1.8
@@ -74,12 +74,21 @@
          response.sendError(HttpServletResponse.SC_NOT_FOUND);
       }
       String redirect = getRedirectUrl(request, pagePath);
+      if (redirect == null) {
+         response.sendError(HttpServletResponse.SC_NOT_FOUND, "pagePath: " + 
pagePath);
+      }
+      else {
       response.sendRedirect(redirect);
    }
+   }
 
 
    private String getRedirectUrl(HttpServletRequest request, String path) {
       NavigationItem item = SiteManagement.getNavigationItemFromPath(path);
+      if (item == null) {
+         return null;
+      }
+      
       String link = SiteManagement.getPath(item, !ServerUtil.useServerName());
 
       String host = null;
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs