Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX JENKINS-35381] Restrict ResourceBundleUtil #2393

Merged
merged 1 commit into from
Jun 7, 2016
Merged

[FIX JENKINS-35381] Restrict ResourceBundleUtil #2393

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions core/src/main/java/jenkins/util/ResourceBundleUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* @author <a href="mailto:[email protected]">[email protected]</a>
* @since 2.0
*/
@Restricted(NoExternalUse.class)
public class ResourceBundleUtil {

private static final Map<String, JSONObject> bundles = new ConcurrentHashMap<>();
Expand All @@ -52,7 +53,6 @@ private ResourceBundleUtil() {
* @return The bundle JSON.
* @throws MissingResourceException Missing resource bundle.
*/
@Restricted(NoExternalUse.class)
public static @Nonnull JSONObject getBundle(@Nonnull String baseName) throws MissingResourceException {
return getBundle(baseName, Locale.getDefault());
}
Expand All @@ -64,7 +64,6 @@ private ResourceBundleUtil() {
* @return The bundle JSON.
* @throws MissingResourceException Missing resource bundle.
*/
@Restricted(NoExternalUse.class)
public static @Nonnull JSONObject getBundle(@Nonnull String baseName, @Nonnull Locale locale) throws MissingResourceException {
String bundleKey = baseName + ":" + locale.toString();
JSONObject bundleJSON = bundles.get(bundleKey);
Expand Down