Author: shane.bryzak(a)jboss.com Date: 2012-05-10 07:29:05 -0400 (Thu, 10 May 2012) New Revision: 14658 Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/faces/ResourceLoader.java Log: JBSEAM-4932 Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/faces/ResourceLoader.java =================================================================== --- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/faces/ResourceLoader.java 2012-05-10 09:49:21 UTC (rev 14657) +++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/faces/ResourceLoader.java 2012-05-10 11:29:05 UTC (rev 14658) @@ -28,15 +28,20 @@ @Override public InputStream getResourceAsStream(String resource) { + InputStream stream = null; + javax.faces.context.FacesContext context = javax.faces.context.FacesContext.getCurrentInstance(); if (context!=null) { - return FacesResources.getResourceAsStream( resource, context.getExternalContext() ); + stream = FacesResources.getResourceAsStream( resource, context.getExternalContext() ); } - else + + if (stream == null) { - return super.getResourceAsStream(resource); + stream = super.getResourceAsStream(resource); } + + return stream; } @Override