[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-serv14866/language-redirect/src/java/com/finalist/cmsc/languageredirect

Modified Files:
      Tag: b1_4
        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.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- LanguageRedirectServlet.java        30 Jan 2008 17:09:20 -0000      1.6
+++ LanguageRedirectServlet.java        26 Jun 2008 09:04:04 -0000      1.6.2.1
@@ -36,7 +36,7 @@
    @Override
    protected Map getAssociations() {
       Map a = super.getAssociations();
-      a.put("language", new Integer(50));
+      a.put("language", Integer.valueOf(50));
       return a;
    }
 
@@ -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