svn commit: r640155 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java

[ivaynberg]

Author: ivaynberg
Date: Sat Mar 22 22:16:35 2008
New Revision: 640155

URL: http://svn.apache.org/viewvc?rev=640155&view=rev
Log:
WICKET-1415: BundleStringResourceLoader throws NPE if component is null

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java?rev=640155&r1=640154&r2=640155&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/resource/loader/BundleStringResourceLoader.java
 Sat Mar 22 22:16:35 2008
@@ -62,7 +62,7 @@
         * @return The string resource value or null if resource not found
         */
        public final String loadStringResource(final Class clazz, final String 
key, Locale locale,
-                       final String style)
+               final String style)
        {
                if (locale == null)
                {
@@ -91,6 +91,7 @@
         */
        public final String loadStringResource(final Component component, final 
String key)
        {
-               return loadStringResource(null, key, component.getLocale(), 
null);
+               final Locale locale = (component != null) ? 
component.getLocale() : null;
+               return loadStringResource(null, key, locale, null);
        }
 }