From fe886f95ddb874383c37a5fa6376c87b2013769b Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 12 Mar 2009 14:01:59 +0000 Subject: [PATCH] Merged V3.1 to HEAD 12984: Sharepoint: Build fix after recent change to SiteService and bumped module version to 1.1 12997: (RECORD ONLY - Already merged) Added home property to start scripts; updated readmes; updated installers 13140: Merged V3.0 to V3.1 13138 Merged V2.2 to V3.0 13133: Fix ETWOTWO-1078: wcm submit does not complete when using Oracle 13146: Merged V3.0 to V3.1 13052: CIFS throws a NullPointerException if a non-relative path is received for a folder search. JLAN-69 13147: Updated svn:mergeinfo 13151: (RECORD ONLY) Changed labs -> enterprise for distribution bundles 13157: Partial fix for ETHREEOH-1277 - fixes usage of Application.getMessage() ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r13052,13138 Merged /alfresco/BRANCHES/V2.2:r13133 Merged /alfresco/BRANCHES/V3.1:r12984,12997,13140,13146-13147,13151,13154,13157 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/ResourceBundleWrapper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java index 45b61c3020..ab347349e4 100644 --- a/source/java/org/alfresco/web/app/ResourceBundleWrapper.java +++ b/source/java/org/alfresco/web/app/ResourceBundleWrapper.java @@ -109,10 +109,7 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria { this.delegates = new ArrayList(ResourceBundleWrapper.addedBundleNames.size() + 2); - // Add the bundle - this.delegates.add(getResourceBundle(locale, this.bundleName)); - - // first try in the repo otherwise try the classpath + // Check for custom bundle (if any) - first try in the repo otherwise try the classpath ResourceBundle customBundle = null; if (getMessageService() != null) @@ -154,11 +151,14 @@ public final class ResourceBundleWrapper extends ResourceBundle implements Seria customBundle = getResourceBundle(locale, customName); } - // Add the custom bundle to the list + // Add the custom bundle (if any) - add first to allow override (eg. in MT/dynamic web client env) if (customBundle != null) { this.delegates.add(customBundle); } + + // Add the normal bundle + this.delegates.add(getResourceBundle(locale, this.bundleName)); // Add the added bundles for (String addedBundleName : ResourceBundleWrapper.addedBundleNames)