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

[Gavin King]

  User: gavin   
  Date: 06/11/13 19:31:27

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  JBSEAM-497
  
  Revision  Changes    Path
  1.47      +8 -2      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -b -r1.46 -r1.47
  --- Pages.java	11 Nov 2006 02:42:11 -0000	1.46
  +++ Pages.java	14 Nov 2006 00:31:27 -0000	1.47
  @@ -224,7 +224,9 @@
   
      private Page createPage(String viewId)
      {
  -      InputStream stream = Resources.getResourceAsStream( replaceExtension(viewId, ".page.xml").substring(1) );
  +      String resourceName = replaceExtension(viewId, ".page.xml");
  +      InputStream stream = resourceName==null ? 
  +            null : Resources.getResourceAsStream( resourceName.substring(1) );
         if ( stream==null ) 
         {
            Page result = new Page(viewId);
  @@ -244,7 +246,11 @@
         if (result==null)
         {
            //workaround for what I believe is a bug in the JSF RI
  -         result = pagesByViewId.get( replaceExtension( viewId, getSuffix() ) );
  +         viewId = replaceExtension( viewId, getSuffix() );
  +         if (viewId!=null)
  +         {
  +            result = pagesByViewId.get( viewId );
  +         }
         }
         return result;
      }