[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Gavin King]

  User: gavin   
  Date: 07/05/08 11:25:53

  Modified:    src/main/org/jboss/seam/mock  MockViewHandler.java
  Log:
  error messages
  
  Revision  Changes    Path
  1.7       +5 -2      jboss-seam/src/main/org/jboss/seam/mock/MockViewHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockViewHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockViewHandler.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- MockViewHandler.java	4 Feb 2007 20:26:14 -0000	1.6
  +++ MockViewHandler.java	8 May 2007 15:25:53 -0000	1.7
  @@ -38,8 +38,11 @@
         String servletPath = ctx.getExternalContext().getRequestServletPath();
         if ( Strings.isEmpty(pathInfo) ) 
         {
  -         return contextPath + viewId.substring( 0, viewId.lastIndexOf('.') ) + 
  -               servletPath.substring( servletPath.lastIndexOf('.') );
  +         int loc = viewId.lastIndexOf('.');
  +         if (loc<0) throw new IllegalArgumentException("no file extension in view id: " + viewId);
  +         int sploc = servletPath.lastIndexOf('.');
  +         if (sploc<0) throw new IllegalArgumentException("no file extension in servlet path: " + servletPath);
  +         return contextPath + viewId.substring(0, loc) + servletPath.substring(sploc);
         }
         else
         {