equal
deleted
inserted
replaced
25 |
25 |
26 package sun.util.calendar; |
26 package sun.util.calendar; |
27 |
27 |
28 import java.security.AccessController; |
28 import java.security.AccessController; |
29 import java.util.TimeZone; |
29 import java.util.TimeZone; |
|
30 import sun.security.action.GetPropertyAction; |
30 |
31 |
31 /** |
32 /** |
32 * |
33 * |
33 * @author Masayoshi Okutsu |
34 * @author Masayoshi Okutsu |
34 * @since 1.6 |
35 * @since 1.6 |
140 if (!"japanese".equals(name)) { |
141 if (!"japanese".equals(name)) { |
141 return null; |
142 return null; |
142 } |
143 } |
143 |
144 |
144 // Append an era to the predefined eras if it's given by the property. |
145 // Append an era to the predefined eras if it's given by the property. |
145 String prop = AccessController.doPrivileged( |
146 String prop = GetPropertyAction |
146 new sun.security.action.GetPropertyAction("jdk.calendar.japanese.supplemental.era")); |
147 .getProperty("jdk.calendar.japanese.supplemental.era"); |
147 if (prop != null) { |
148 if (prop != null) { |
148 Era era = parseEraEntry(prop); |
149 Era era = parseEraEntry(prop); |
149 if (era != null) { |
150 if (era != null) { |
150 if (isValidEra(era, JAPANESE_ERAS)) { |
151 if (isValidEra(era, JAPANESE_ERAS)) { |
151 int length = JAPANESE_ERAS.length; |
152 int length = JAPANESE_ERAS.length; |