inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
98198: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      98160: Merged DEV to 5.0.N (5.0.2)
         98042: MNT-13442: Accessing nodes via ticket URL yields "Error during download content servlet processing: null"
            - added null check for normal resource bundle


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-03-02 12:08:44 +00:00
parent 3a67433d8a
commit d7c4ac87da
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/java/org/alfresco/web/app/ResourceBundleWrapper.java
View File

@@ -152,7 +152,18 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria
} }
// Add the normal bundle // Add the normal bundle
this.delegates.add(getResourceBundle(locale, this.bundleName)); ResourceBundle normalBundle = getResourceBundle(locale, this.bundleName);
if (normalBundle != null)
{
this.delegates.add(normalBundle);
}
else
{
if (logger.isWarnEnabled())
{
logger.warn("Resource bundle missing : " + this.bundleName + ", locale : " + locale);
}
}
// Add the added bundles // Add the added bundles
for (String addedBundleName : ResourceBundleWrapper.addedBundleNames) for (String addedBundleName : ResourceBundleWrapper.addedBundleNames)