Mercurial > hg > release > icedtea7-forest-2.5 > jdk
changeset 7913:0ee1eb5c32bf
8044274: Proper property processing
Reviewed-by: naoto
author | dmeetry |
---|---|
date | Fri, 04 Jul 2014 21:03:03 +0400 |
parents | d836e1453388 |
children | 5b9e9506bd57 |
files | src/share/classes/java/util/ResourceBundle.java |
diffstat | 1 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/util/ResourceBundle.java Fri May 30 14:48:50 2014 +0400 +++ b/src/share/classes/java/util/ResourceBundle.java Fri Jul 04 21:03:03 2014 +0400 @@ -2577,7 +2577,10 @@ } catch (ClassNotFoundException e) { } } else if (format.equals("java.properties")) { - final String resourceName = toResourceName(bundleName, "properties"); + final String resourceName = toResourceName0(bundleName, "properties"); + if (resourceName == null) { + return bundle; + } final ClassLoader classLoader = loader; final boolean reloadFlag = reload; InputStream stream = null; @@ -2731,7 +2734,10 @@ } boolean result = false; try { - String resourceName = toResourceName(toBundleName(baseName, locale), format); + String resourceName = toResourceName0(toBundleName(baseName, locale), format); + if (resourceName == null) { + return result; + } URL url = loader.getResource(resourceName); if (url != null) { long lastModified = 0; @@ -2865,6 +2871,15 @@ sb.append(bundleName.replace('.', '/')).append('.').append(suffix); return sb.toString(); } + + private String toResourceName0(String bundleName, String suffix) { + // application protocol check + if (bundleName.contains("://")) { + return null; + } else { + return toResourceName(bundleName, suffix); + } + } } private static class SingleFormatControl extends Control {