From d7c4ac87da37e76ab73aca6f22d2d4322d981395 Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Mon, 2 Mar 2015 12:08:44 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    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
---
 .../org/alfresco/web/app/ResourceBundleWrapper.java | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java
index 9f9f5b732f..9ba37edfce 100644
--- a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java
+++ b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java
@@ -152,7 +152,18 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria
          }
          
          // 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
          for (String addedBundleName : ResourceBundleWrapper.addedBundleNames)