Fri, 23 Sep 2016 23:06:45 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Sep 19 21:11:34 2016 -0700 1.2 +++ b/.hgtags Fri Sep 23 23:06:45 2016 -0700 1.3 @@ -597,6 +597,9 @@ 1.4 8f0466c0dce60b1df3bc01785b01a7f09fa7b564 jdk8u92-b13 1.5 5617f9bec354fb2c60bbb816d175f4cee7d2c56e jdk8u92-b14 1.6 fe88377e18b0c5f3da8e6741e0d5b9bfd45d2648 jdk8u92-b31 1.7 +11e4e7e901bc86d14163afbc5d28345e36737344 jdk8u92-b32 1.8 +9ed665d319590e0b9997b3703314c6b0341d4362 jdk8u92-b33 1.9 +5b5f76caf6e4ffa51f25e64d0d79a3f0913c633e jdk8u92-b34 1.10 073b951904b3ee7c54fb79a169478fa66d925320 jdk8u75-b00 1.11 5b48f7defe40eab668fe554df0afd87d84d60722 jdk8u75-b01 1.12 0015f4a7f0d02a9bb79b7a0c737590f01feaabd4 jdk8u75-b02 1.13 @@ -661,10 +664,36 @@ 1.14 57546b5b575dec9ecfbb1e9a77d87c391a44ab96 jdk8u102-b12 1.15 a7c292080d5ed76ea5e3b123c0dee4c340aa174f jdk8u102-b13 1.16 56b133772ec1aa4f44f2eee2c4103c645f764935 jdk8u102-b14 1.17 +8ba5a41487af9fe72aeb92e790327d12dce0de8c jdk8u102-b31 1.18 +52cca1ce8b473ecd751da2350d4b3ef111b5676e jdk8u111-b00 1.19 +d123c31c3bc21ccf02ac7368f5476dd9975e15e3 jdk8u111-b01 1.20 +981c4d9dab16b3fa7333e5baa5497c299acd5172 jdk8u111-b02 1.21 +893adc105044c14abfb54de32a79f2f21981cafa jdk8u111-b03 1.22 +ec7b9aafd7e1e9763925e8b794834612bbe0e19b jdk8u111-b04 1.23 +3a25f8a752524bad7e78800158c485b890be3982 jdk8u111-b05 1.24 +d5dabec41733e59f00dd456f88fb00b3803bed8b jdk8u111-b06 1.25 +d8a1e50ce110d18b3ad01ee5c997425bfe90b2a1 jdk8u111-b07 1.26 +560812b6d1948df7794f22840e4e3976258b034e jdk8u111-b08 1.27 +dbbb2551c63687d9c4a2bb38c42864503cf06465 jdk8u111-b09 1.28 +36ccdd95d018368c8a1d70fd40cc8ca3a2c0590f jdk8u111-b10 1.29 +dad7b1a59da60d68ff26bf7414b87995fecaaba6 jdk8u111-b11 1.30 +a42cdfaa1218a636d2cd0b89a233362cdf32dd4b jdk8u111-b12 1.31 +2214875a44e52789acf404b56543f613516ee498 jdk8u111-b13 1.32 +7898951ff63c9ea721b8f669b9c749d6c3a2db99 jdk8u111-b14 1.33 b87d82f5c33dfb55bfc81254044f28eea5d7424a jdk8u112-b00 1.34 1f2394102288d9073652064784e31a3f52fc5d4b jdk8u112-b01 1.35 40c934289deefd68915f6519d71a4e315c69117a jdk8u112-b02 1.36 ddb3a8afe0ad50e04d360efa96aee78cb599ea72 jdk8u112-b03 1.37 1d0047d03f04c0c15c7856e0f177b9e15e94a692 jdk8u112-b04 1.38 +b6cdfd0b4a9cff1ed1bb43ef7fb21dc4d2dfe7d8 jdk8u112-b06 1.39 +9d09ca09ea33e6af774914606f94960e5af4fc9b jdk8u112-b07 1.40 +0ac6b67980512ce025a280d42c05156293613dbb jdk8u112-b08 1.41 +0d9ae87a0dfe893922b730312d9173ad5dd5f0d6 jdk8u112-b09 1.42 +09fb07ae151729154a2dd253d06bdad8955c2685 jdk8u112-b10 1.43 +4363b0b339a482ec9eefee11dc5877a618e8c681 jdk8u112-b11 1.44 +be34a52805408eb5edaf3d8de4fae47632a757c5 jdk8u112-b12 1.45 +4d45315307323fcb9dd84c3f0b0a1dc76f2b3b5f jdk8u112-b13 1.46 +18bbb95d097e04ea2b88df8910056fe294da0149 jdk8u112-b14 1.47 +30f83ac389f06c38dc0b6f71b1d8344c01436a16 jdk8u112-b15 1.48 58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00 1.49 a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
2.1 --- a/src/share/classes/javax/rmi/CORBA/Util.java Mon Sep 19 21:11:34 2016 -0700 2.2 +++ b/src/share/classes/javax/rmi/CORBA/Util.java Fri Sep 23 23:06:45 2016 -0700 2.3 @@ -414,7 +414,7 @@ 2.4 // set to allow the loading of the Util delegate 2.5 // which provides access to custom ValueHandler 2.6 sm.checkPermission(new SerializablePermission( 2.7 - "enableCustomValueHanlder")); 2.8 + "enableCustomValueHandler")); 2.9 } 2.10 } 2.11 }