[seam-commits] Seam SVN: r14659 - branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/faces.

[seam-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2012-05-10 08:26:59 -0400 (Thu, 10 May 2012)
New Revision: 14659

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 11:29:05 UTC (rev 14658)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/faces/ResourceLoader.java	2012-05-10 12:26:59 UTC (rev 14659)
@@ -47,15 +47,20 @@
    @Override
    public URL getResource(String resource) 
    {
+      URL url = null;
+       
       javax.faces.context.FacesContext context = javax.faces.context.FacesContext.getCurrentInstance();
       if (context!=null)
       {
-         return FacesResources.getResource( resource, context.getExternalContext() );
+          url = FacesResources.getResource( resource, context.getExternalContext() );
       }
-      else
+      
+      if (url == null)    
       {
-         return super.getResource(resource);
+          url = super.getResource(resource);
       }
+      
+      return url;
    }
    
 }