Fix #24115 Reason phrase is not printed in the validation error message

Signed-off-by: kaido207 <kaido.hiroki@fujitsu.com>
eclipse-ee4j · Sep 26, 2022 · e036ab5 · e036ab5
1 parent 04a44a1
commit e036ab5
Showing 1 changed file with 2 additions and 12 deletions.
diff --git a/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/MessageInterpolatorImpl.java b/nucleus/hk2/hk2-config/src/main/java/org/jvnet/hk2/config/MessageInterpolatorImpl.java
@@ -113,22 +113,12 @@ public String interpolate(String message, Context context, Locale locale) {
         // if the message is not already in the cache we have to run step 1-3 of the message resolution
         if (resolvedMessage == null) {
             ResourceBundle userResourceBundle = new ContextResourceBundle(context, locale);
-            ClassLoader cl;
-            if (System.getSecurityManager()!=null) {
-                cl = AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() {
-                    @Override
-                    public ClassLoader run() {
-                        return MessageInterpolator.class.getClassLoader();
-                    }
-                });
-            } else {
-                cl = MessageInterpolator.class.getClassLoader();
-            }
+            ClassLoader classLoader = MessageInterpolatorImpl.class.getClassLoader();
             ResourceBundle defaultResourceBundle = null;
             try {
                 defaultResourceBundle = ResourceBundle.getBundle(DEFAULT_VALIDATION_MESSAGES,
                     locale,
-                    cl);
+                    classLoader);
             }
             catch (MissingResourceException mre) {
                 // defaultResourceBundle is already null