You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/11/30 20:38:42 UTC

svn commit: r885559 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java

Author: lu4242
Date: Mon Nov 30 19:38:41 2009
New Revision: 885559

URL: http://svn.apache.org/viewvc?rev=885559&view=rev
Log:
MYFACES-2429 Missing localePrefix for resources is not ignored (Thanks to Michael Kurz for this patch)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=885559&r1=885558&r2=885559&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Mon Nov 30 19:38:41 2009
@@ -440,7 +440,14 @@
 
             if (bundle != null)
             {
-                localePrefix = bundle.getString(ResourceHandler.LOCALE_PREFIX);                
+                try
+                {
+                    localePrefix = bundle.getString(ResourceHandler.LOCALE_PREFIX);
+                }
+                catch (MissingResourceException e)
+                {
+                    // Ignore it and return null
+                }
             }
         }
         return localePrefix;