You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/02/01 19:51:28 UTC

svn commit: r617603 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java

Author: matzew
Date: Fri Feb  1 10:51:27 2008
New Revision: 617603

URL: http://svn.apache.org/viewvc?rev=617603&view=rev
Log:
TRINIDAD-915

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java?rev=617603&r1=617602&r2=617603&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TranslationsResourceLoader.java Fri Feb  1 10:51:27 2008
@@ -123,7 +123,9 @@
     // to avoid sending down duplicated key/value pairs
     Map<String, String> messages = new HashMap<String, String>();
     _addMessagesToMap(messages, bundle);
-    _addMessagesToMap(messages, applicationBundle, true);
+    
+    if(applicationBundle != null)
+      _addMessagesToMap(messages, applicationBundle, true);
     
 
     // FIXME: would be much better to directly stream the contents