/hg/release/icedtea7-forest-2.1/jdk: 67 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Jun 18 14:10:35 PDT 2013


changeset d567e1a9b596 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d567e1a9b596
author: mbankal
date: Fri Sep 14 09:38:27 2012 -0700

	7195301: XML Signature DOM implementation should not use instanceof to determine type of Node
	Reviewed-by: mullan


changeset edc4404c1938 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=edc4404c1938
author: andrew
date: Wed Jun 12 14:56:51 2013 +0100

	6741606: Integrate Apache Santuario
	Reviewed-by: vinnie, hawtin


changeset 9c9991e940a2 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=9c9991e940a2
author: andrew
date: Wed Jun 12 14:57:30 2013 +0100

	7170730: Improve Windows network stack support.
	Summary: Enable exclusive binding of ports on Windows
	Reviewed-by: alanb, chegar, ahgross


changeset 9a5782006b61 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=9a5782006b61
author: dmocek
date: Mon Mar 04 14:34:15 2013 -0800

	8000638: Improve deserialization
	Reviewed-by: smarks, hawtin, mchung


changeset 56b8579d4ff5 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=56b8579d4ff5
author: andrew
date: Wed Jun 12 14:58:31 2013 +0100

	8001032: Restrict object access
	Summary: Restrict object access; fix reviewed also by Alexander Fomin
	Reviewed-by: alanb, ahgross


changeset 412901ba0aaf in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=412901ba0aaf
author: dmocek
date: Wed Mar 13 17:24:34 2013 -0700

	8001033: Refactor network address handling in virtual machine identifiers
	Reviewed-by: smarks, hawtin, mchung


changeset cfaac8a34398 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=cfaac8a34398
author: bae
date: Wed Feb 27 11:53:10 2013 +0400

	8001034: Memory management improvements
	Reviewed-by: prr, jgodinez


changeset f04ccacdf305 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=f04ccacdf305
author: bae
date: Thu Mar 28 22:17:04 2013 +0400

	8001038: Resourcefully handle resources
	Reviewed-by: mschoene, prr, bae
	Contributed-by: jia-hong.chen at oracle.com


changeset 41699e6f328f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=41699e6f328f
author: dfuchs
date: Fri Mar 15 17:59:10 2013 +0100

	8001043: Clarify definition restrictions
	Reviewed-by: alanb, skoivu, smarks


changeset 6e5d9d0cfcc9 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=6e5d9d0cfcc9
author: andrew
date: Wed Jun 12 15:05:39 2013 +0100

	8001308: Update display of applet windows
	Summary: Implemented security warning for OS X port
	Reviewed-by: art, anthony, serb, skoivu


changeset c87f9d33fde6 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c87f9d33fde6
author: dmeetry
date: Mon Mar 25 12:41:55 2013 +0400

	8001309: Better handling of annotation interfaces
	Reviewed-by: darcy


changeset 5dd926007336 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5dd926007336
author: khazra
date: Thu Mar 28 14:59:22 2013 -0700

	8001318: Socket.getLocalAddress not consistent with InetAddress.getLocalHost
	Reviewed-by: alanb, chegar, hawtin


changeset a68d49b9b053 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a68d49b9b053
author: mullan
date: Fri Apr 05 08:33:25 2013 -0400

	8001330: Improve on checking order
	Reviewed-by: acorn, hawtin


changeset 234cf2f595bf in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=234cf2f595bf
author: sla
date: Mon Mar 18 15:22:51 2013 +0100

	8003703: Update RMI connection dialog box
	Reviewed-by: skoivu, ahgross, mchung, jbachorik


changeset 278d2d39eed8 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=278d2d39eed8
author: alanb
date: Wed Feb 27 11:50:30 2013 +0000

	8004288: (fs) Files.probeContentType problems
	Reviewed-by: ahgross, sherman


changeset 0805ccc98362 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0805ccc98362
author: andrew
date: Wed Jun 12 15:09:03 2013 +0100

	8004584: Augment applet contextualization
	Summary: Do not create the main AppContext for applets
	Reviewed-by: art, ahgross


changeset 524837816f3e in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=524837816f3e
author: prr
date: Sun Mar 31 09:05:58 2013 -0700

	8005007: Better glyph processing
	Reviewed-by: srl, mschoene, bae


changeset df371bf8d9a4 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=df371bf8d9a4
author: serb
date: Sat Mar 30 22:45:54 2013 +0400

	8006328: Improve robustness of sound classes
	8009057: Improve MIDI event handling
	Reviewed-by: amenkov, art, skoivu


changeset b4d1ed547a75 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b4d1ed547a75
author: sundar
date: Fri Apr 05 15:39:25 2013 +0530

	8006611: Improve scripting
	Reviewed-by: mchung, jdn


changeset 02cba1c3572a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=02cba1c3572a
author: sjiang
date: Tue Mar 19 18:45:19 2013 +0100

	8007467: Improve robustness of JMX internal APIs
	Reviewed-by: dfuchs, mchung, skoivu


changeset d22aa05d0e4c in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d22aa05d0e4c
author: dsamersoff
date: Thu Mar 21 22:32:42 2013 +0400

	8007471: Improve MBean notifications
	Summary: Improve MBean notifications
	Reviewed-by: dfuchs, mchung, alanb, skoivu


changeset 0a66867d6baa in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0a66867d6baa
author: jfranck
date: Mon Mar 25 20:18:21 2013 +0100

	8007812: (reflect) Class.getEnclosingMethod problematic for some classes
	Summary: Better checking in getEnclosing(Method|Constructor|Class)
	Reviewed-by: darcy, ahgross, mchung


changeset 38c68381e29f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=38c68381e29f
author: bae
date: Thu Mar 28 23:01:08 2013 +0400

	8007925: Improve cmsStageAllocLabV2ToV4curves
	8007926: Improve cmsPipelineDup
	Reviewed-by: bae, prr
	Contributed-by: jia-hong.chen at oracle.com


changeset 62348d83f9c9 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=62348d83f9c9
author: bae
date: Thu Mar 21 11:52:10 2013 +0400

	8007927: Improve cmsAllocProfileSequenceDescription
	Reviewed-by: bae, prr
	Contributed-by: jia-hong.chen at oracle.com


changeset 78d2622e362e in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=78d2622e362e
author: bae
date: Thu Mar 21 12:02:04 2013 +0400

	8007929: Improve CurvesAlloc
	Reviewed-by: bae, prr
	Contributed-by: jia-hong.chen at oracle.com


changeset f421e2622e84 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=f421e2622e84
author: dsamersoff
date: Wed Mar 27 14:32:58 2013 +0400

	8008120: Improve JMX class checking
	Summary: Improve JMX class checking
	Reviewed-by: mchung, dfuchs, alanb, skoivu


changeset bbabb695cc3a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=bbabb695cc3a
author: dsamersoff
date: Thu Mar 28 23:39:28 2013 +0400

	8008124: Better compliance testing
	Summary: Better compliance testing
	Reviewed-by: dfuchs, jfdenise, skoivu, alanb


changeset 05df38046a8a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=05df38046a8a
author: andrew
date: Tue Jun 11 13:13:12 2013 +0100

	8008128: Better API coherence for JMX
	Summary: Permission for getting classloader
	Reviewed-by: alanb, dfuchs, skoivu
	Contributed-by: jean-francois.denise at oracle.com


changeset e23bdc1f27d4 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=e23bdc1f27d4
author: smarks
date: Mon Mar 25 17:05:30 2013 +0000

	8008132: Better serialization support
	Reviewed-by: alanb, hawtin


changeset 53e0fee6e381 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=53e0fee6e381
author: jbachorik
date: Thu Mar 14 14:42:12 2013 +0100

	8008585: Better JMX data handling
	Reviewed-by: alanb, dfuchs, jfdenise, skoivu, sjiang


changeset d8c25838734f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d8c25838734f
author: andrew
date: Wed Jun 12 15:11:46 2013 +0100

	8004584: Augment applet contextualization
	Summary: Do not create the main AppContext for applets
	Reviewed-by: art, ahgross


changeset 05e7f2135bca in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=05e7f2135bca
author: jbachorik
date: Thu Mar 07 14:05:05 2013 +0100

	8008603: Improve provision of JMX providers
	Reviewed-by: alanb, dfuchs, jfdenise, skoivu


changeset 53d83931a29f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=53d83931a29f
author: jbachorik
date: Thu Mar 14 14:45:55 2013 +0100

	8008607: Better input checking in JMX
	Reviewed-by: dfuchs, mchung, skoivu, sjiang


changeset 0fe7dd24c5bb in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0fe7dd24c5bb
author: egahlin
date: Thu Mar 21 13:56:28 2013 +0100

	8008611: Better handling of annotations in JMX
	Reviewed-by: skoivu, dholmes, jfdenise


changeset c4a8017b0818 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c4a8017b0818
author: sjiang
date: Thu Mar 21 18:27:25 2013 +0100

	8008615: Improve robustness of JMX internal APIs
	Reviewed-by: dfuchs, skoivu, dholmes


changeset 5fc193fbdff4 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=5fc193fbdff4
author: jbachorik
date: Thu Mar 21 09:26:55 2013 +0100

	8008623: Better handling of MBeanServers
	Reviewed-by: dfuchs, dholmes, skoivu


changeset 62474ae38ea3 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=62474ae38ea3
author: mullan
date: Wed May 01 17:19:04 2013 -0400

	8008744: Rework part of fix for JDK-6741606
	Reviewed-by: xuelei, ahgross


changeset 460677aae016 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=460677aae016
author: jbachorik
date: Thu Mar 28 09:39:26 2013 +0100

	8008982: Adjust JMX for underlying interface changes
	Reviewed-by: mchung, dholmes, dfuchs, skoivu


changeset 816837369ee5 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=816837369ee5
author: jfdenise
date: Mon Mar 18 13:50:19 2013 +0100

	8009004: Better implementation of RMI connections
	Summary: Better class handling.
	Reviewed-by: alanb, dfuchs, skoivu, jbachorik
	Contributed-by: jean-francois.denise at oracle.com


changeset fbfcbc8fa136 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=fbfcbc8fa136
author: bae
date: Tue Mar 26 11:56:00 2013 +0400

	8009013: Better handling of T2K glyphs
	Reviewed-by: bae, prr
	Contributed-by: jia-hong.chen at oracle.com


changeset 8f3def9cab48 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=8f3def9cab48
author: jbachorik
date: Tue Mar 12 11:09:37 2013 +0100

	8009034: Improve resulting notifications in JMX
	Summary: Disallowing access to mutable shared arrays
	Reviewed-by: dfuchs, mchung, skoivu


changeset d6cdeea8b194 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d6cdeea8b194
author: jbachorik
date: Tue Mar 12 09:34:26 2013 +0100

	8009038: Improve JMX notification support
	Summary: Disallowing access to mutable shared arrays
	Reviewed-by: dfuchs, mchung, skoivu


changeset 1b844fe1bb58 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=1b844fe1bb58
author: vinnie
date: Thu Mar 21 10:42:36 2013 +0000

	8009067: Improve storing keys in KeyStore
	Reviewed-by: mullan, skoivu


changeset 94aeaa544fd0 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=94aeaa544fd0
author: andrew
date: Wed Jun 12 15:13:37 2013 +0100

	8009071: Improve shape handling
	Reviewed-by: art, mschoene


changeset d5b0fafe5008 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d5b0fafe5008
author: vinnie
date: Mon Apr 08 21:17:57 2013 +0100

	8009235: Improve handling of TSA data
	Reviewed-by: ahgross, mullan


changeset 777c7be511a7 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=777c7be511a7
author: andrew
date: Wed Jun 12 15:16:26 2013 +0100

	8009424: Adapt Nashorn to JSR-292 implementation change
	Reviewed-by: jrose, twisti, jdn, mchung


changeset a2a7730dff8a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a2a7730dff8a
author: lancea
date: Fri Mar 22 15:40:16 2013 -0400

	8009554: Improve SerialJavaObject.getFields
	Reviewed-by: alanb, skoivu


changeset ccc9d6467f7a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=ccc9d6467f7a
author: andrew
date: Tue Jun 11 14:44:01 2013 +0100

	8009654: Improve stability of cmsnamed
	Reviewed-by: bae, prr
	Contributed-by: jia-hong.chen at oracle.com


changeset c9b81c0d3b0d in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c9b81c0d3b0d
author: jbachorik
date: Wed Mar 27 13:29:22 2013 +0100

	8010209: Better provision of factories
	Reviewed-by: dcubed, ahgross


changeset d7d3b36cba41 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d7d3b36cba41
author: bae
date: Tue Apr 09 15:03:29 2013 +0400

	8011243: Improve ImagingLib
	Reviewed-by: mschoene, prr, vadim


changeset a684a2b459cb in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a684a2b459cb
author: prr
date: Mon Apr 08 12:41:09 2013 -0700

	8011248: Better Component Rasters
	Reviewed-by: bae, vadim, mschoene


changeset ad770ca9e9f6 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=ad770ca9e9f6
author: prr
date: Mon Apr 08 12:46:20 2013 -0700

	8011253: Better Short Component Rasters
	Reviewed-by: bae, vadim, mschoene


changeset 52080db9cd97 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=52080db9cd97
author: prr
date: Mon Apr 08 12:48:19 2013 -0700

	8011257: Better Byte Component Rasters
	Reviewed-by: bae, vadim, mschoene


changeset d03d07eea280 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=d03d07eea280
author: mchung
date: Fri Apr 05 08:43:00 2013 -0700

	8011557: Improve reflection utility classes
	Reviewed-by: ahgross, alanb


changeset a03c8f40cbc6 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=a03c8f40cbc6
author: prr
date: Fri Apr 19 15:40:03 2013 -0700

	8012421: Better positioning of PairPositioning
	Reviewed-by: srl, mschoene, vadim


changeset 785c2a96d910 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=785c2a96d910
author: bae
date: Wed Apr 24 15:23:44 2013 +0400

	8012438: Better image validation
	Reviewed-by: mschoene, prr, vadim


changeset f50ec548334f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=f50ec548334f
author: bae
date: Tue Apr 30 04:20:46 2013 +0400

	8012597: Better image channel verification
	Reviewed-by: ahgross, vadim, prr


changeset 137930f4666f in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=137930f4666f
author: bae
date: Fri Apr 26 09:30:54 2013 +0400

	8012601: Better validation of image layouts
	Reviewed-by: mschoene, prr, vadim


changeset b56b4751faf0 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b56b4751faf0
author: xuelei
date: Mon May 13 18:30:45 2013 -0700

	8014281: Better checking of XML signature
	Summary: also reviewed by Andrew Gross and Christophe Ravel
	Reviewed-by: mullan


changeset 27e8f5644011 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=27e8f5644011
author: andrew
date: Wed Jun 12 15:18:06 2013 +0100

	8014618: Need to strip leading zeros in TlsPremasterSecret of DHKeyAgreement
	Reviewed-by: xuelei
	Contributed-by: Pasi Eronen <pe at iki.fi>


changeset db23fdcb8244 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=db23fdcb8244
author: andrew
date: Wed Jun 12 11:46:50 2013 +0100

	7151434: java -jar -XX crashes java launcher
	Reviewed-by: mchung, darcy, jjh, dholmes


changeset 649b424bb842 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=649b424bb842
author: andrew
date: Wed Jun 12 11:48:21 2013 +0100

	7142596: RMI JPRT tests are failing
	Summary: Changed RMI tests to use random port numbers for the RMI Registry and RMID so the tests can be run concurrently without test failures due to tests using the same port numbers.
	Reviewed-by: smarks, alanb
	Contributed-by: olivier.lagneau at oracle.com


changeset c00efeece9f2 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=c00efeece9f2
author: andrew
date: Fri Jun 14 10:05:04 2013 +0100

	Handle NullPointerException in getNotificationInfo


changeset 0ab2712a035a in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=0ab2712a035a
author: andrew
date: Tue Jun 18 08:09:59 2013 -0500

	8010118: Annotate jdk caller sensitive methods with @sun.reflect.CallerSensitive
	Reviewed-by: alanb, twisti, jrose, kvn


changeset e28599cbc0d4 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=e28599cbc0d4
author: andrew
date: Tue Jun 18 08:15:49 2013 -0500

	8009424: Adapt Nashorn to JSR-292 implementation change
	Reviewed-by: jrose, twisti, jdn, mchung


changeset b2325315c6ec in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=b2325315c6ec
author: andrew
date: Tue Jun 18 08:18:57 2013 -0500

	7077803: java.lang.InternalError in java.lang.invoke.MethodHandleNatives.init
	Summary: Use correct access token for unreflecting MHs where setAccessible(true)
	Reviewed-by: never, twisti


changeset 4a67dd684bc2 in /hg/release/icedtea7-forest-2.1/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk?cmd=changeset;node=4a67dd684bc2
author: andrew
date: Tue Jun 18 08:07:48 2013 -0500

	8002070: Remove the stack search for a resource bundle for Logger to use
	Summary: The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String)
	Reviewed-by: mchung, alanb


diffstat:

 make/java/java/FILES_c.gmk                                                                                               |    2 -
 make/java/java/mapfile-vers                                                                                              |    3 -
 make/java/java/reorder-i586                                                                                              |    1 -
 make/java/java/reorder-sparc                                                                                             |    1 -
 make/java/java/reorder-sparcv9                                                                                           |    1 -
 make/java/nio/mapfile-linux                                                                                              |    1 +
 make/java/nio/mapfile-solaris                                                                                            |    1 +
 make/java/zip/mapfile-vers                                                                                               |    1 +
 make/java/zip/reorder-i586                                                                                               |    1 +
 make/java/zip/reorder-sparc                                                                                              |    1 +
 make/java/zip/reorder-sparcv9                                                                                            |    1 +
 make/sun/awt/Makefile                                                                                                    |   81 +-
 make/sun/awt/ToBin.java                                                                                                  |   59 +
 make/sun/xawt/Makefile                                                                                                   |   67 +-
 make/sun/xawt/ToBin.java                                                                                                 |   59 -
 src/share/bin/java.c                                                                                                     |    7 +
 src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java                                                            |    7 +-
 src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java                                             |   15 +-
 src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java                                              |   16 +-
 src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java                                                          |    3 +-
 src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java                                               |   15 +-
 src/share/classes/com/sun/jmx/mbeanserver/Introspector.java                                                              |   14 +-
 src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java                                                            |   21 +-
 src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java                                                         |   46 +-
 src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java                                                         |    4 +-
 src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java                                               |    3 +-
 src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java                                                 |    3 +-
 src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java                                               |   16 +-
 src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java                                                  |   18 +-
 src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java                                                         |    7 +-
 src/share/classes/com/sun/media/sound/AbstractDataLine.java                                                              |   45 +-
 src/share/classes/com/sun/media/sound/AbstractLine.java                                                                  |   69 +-
 src/share/classes/com/sun/media/sound/AbstractMidiDevice.java                                                            |   44 +-
 src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java                                                    |   16 +-
 src/share/classes/com/sun/media/sound/AbstractMixer.java                                                                 |   54 +-
 src/share/classes/com/sun/media/sound/AiffFileFormat.java                                                                |   10 +-
 src/share/classes/com/sun/media/sound/AiffFileReader.java                                                                |   34 +-
 src/share/classes/com/sun/media/sound/AiffFileWriter.java                                                                |   14 +-
 src/share/classes/com/sun/media/sound/AlawCodec.java                                                                     |   14 +-
 src/share/classes/com/sun/media/sound/AuFileFormat.java                                                                  |    6 +-
 src/share/classes/com/sun/media/sound/AuFileReader.java                                                                  |   34 +-
 src/share/classes/com/sun/media/sound/AuFileWriter.java                                                                  |   16 +-
 src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java                                                      |    4 +-
 src/share/classes/com/sun/media/sound/AudioFloatConverter.java                                                           |   39 +-
 src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java                                                     |   51 +-
 src/share/classes/com/sun/media/sound/AudioFloatInputStream.java                                                         |   26 +-
 src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java                                                  |    4 +-
 src/share/classes/com/sun/media/sound/DLSInfo.java                                                                       |    4 +-
 src/share/classes/com/sun/media/sound/DLSInstrument.java                                                                 |   18 +-
 src/share/classes/com/sun/media/sound/DLSModulator.java                                                                  |   16 +-
 src/share/classes/com/sun/media/sound/DLSRegion.java                                                                     |   28 +-
 src/share/classes/com/sun/media/sound/DLSSample.java                                                                     |   14 +-
 src/share/classes/com/sun/media/sound/DLSSampleLoop.java                                                                 |   10 +-
 src/share/classes/com/sun/media/sound/DLSSampleOptions.java                                                              |   14 +-
 src/share/classes/com/sun/media/sound/DLSSoundbank.java                                                                  |   12 +-
 src/share/classes/com/sun/media/sound/DLSSoundbankReader.java                                                            |    4 +-
 src/share/classes/com/sun/media/sound/DataPusher.java                                                                    |    8 +-
 src/share/classes/com/sun/media/sound/DirectAudioDevice.java                                                             |   44 +-
 src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java                                                     |   68 +-
 src/share/classes/com/sun/media/sound/EmergencySoundbank.java                                                            |    4 +-
 src/share/classes/com/sun/media/sound/EventDispatcher.java                                                               |   34 +-
 src/share/classes/com/sun/media/sound/FFT.java                                                                           |   12 +-
 src/share/classes/com/sun/media/sound/FastShortMessage.java                                                              |    6 +-
 src/share/classes/com/sun/media/sound/JARSoundbankReader.java                                                            |   22 +-
 src/share/classes/com/sun/media/sound/JDK13Services.java                                                                 |   16 +-
 src/share/classes/com/sun/media/sound/JSSecurityManager.java                                                             |  103 +-
 src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java                                                            |   12 +-
 src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java                                                    |    4 +-
 src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java                                                 |    4 +-
 src/share/classes/com/sun/media/sound/MidiInDevice.java                                                                  |    9 +-
 src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java                                                          |   15 +-
 src/share/classes/com/sun/media/sound/MidiOutDevice.java                                                                 |    6 +-
 src/share/classes/com/sun/media/sound/MidiOutDeviceProvider.java                                                         |   15 +-
 src/share/classes/com/sun/media/sound/MidiUtils.java                                                                     |   11 +-
 src/share/classes/com/sun/media/sound/ModelByteBuffer.java                                                               |    8 +-
 src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java                                                      |   12 +-
 src/share/classes/com/sun/media/sound/ModelConnectionBlock.java                                                          |    4 +-
 src/share/classes/com/sun/media/sound/ModelDestination.java                                                              |    4 +-
 src/share/classes/com/sun/media/sound/ModelIdentifier.java                                                               |    4 +-
 src/share/classes/com/sun/media/sound/ModelInstrument.java                                                               |    8 +-
 src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java                                                     |    4 +-
 src/share/classes/com/sun/media/sound/ModelMappedInstrument.java                                                         |    6 +-
 src/share/classes/com/sun/media/sound/ModelPatch.java                                                                    |    4 +-
 src/share/classes/com/sun/media/sound/ModelPerformer.java                                                                |    6 +-
 src/share/classes/com/sun/media/sound/ModelSource.java                                                                   |    4 +-
 src/share/classes/com/sun/media/sound/ModelStandardDirector.java                                                         |    4 +-
 src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java                                                  |    4 +-
 src/share/classes/com/sun/media/sound/ModelStandardTransform.java                                                        |    4 +-
 src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java                                                                 |   10 +-
 src/share/classes/com/sun/media/sound/Platform.java                                                                      |   25 +-
 src/share/classes/com/sun/media/sound/PortMixer.java                                                                     |   28 +-
 src/share/classes/com/sun/media/sound/PortMixerProvider.java                                                             |   46 +-
 src/share/classes/com/sun/media/sound/Printer.java                                                                       |   10 +-
 src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java                                                      |    4 +-
 src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java                                                    |    4 +-
 src/share/classes/com/sun/media/sound/RIFFReader.java                                                                    |    8 +-
 src/share/classes/com/sun/media/sound/RIFFWriter.java                                                                    |   16 +-
 src/share/classes/com/sun/media/sound/RealTimeSequencer.java                                                             |   78 +-
 src/share/classes/com/sun/media/sound/RealTimeSequencerProvider.java                                                     |    4 +-
 src/share/classes/com/sun/media/sound/SF2GlobalRegion.java                                                               |    4 +-
 src/share/classes/com/sun/media/sound/SF2Instrument.java                                                                 |   22 +-
 src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java                                                           |    6 +-
 src/share/classes/com/sun/media/sound/SF2Layer.java                                                                      |   10 +-
 src/share/classes/com/sun/media/sound/SF2LayerRegion.java                                                                |    6 +-
 src/share/classes/com/sun/media/sound/SF2Modulator.java                                                                  |   14 +-
 src/share/classes/com/sun/media/sound/SF2Sample.java                                                                     |   24 +-
 src/share/classes/com/sun/media/sound/SF2Soundbank.java                                                                  |   36 +-
 src/share/classes/com/sun/media/sound/SF2SoundbankReader.java                                                            |    4 +-
 src/share/classes/com/sun/media/sound/SoftAbstractResampler.java                                                         |    6 +-
 src/share/classes/com/sun/media/sound/SoftAudioBuffer.java                                                               |    4 +-
 src/share/classes/com/sun/media/sound/SoftAudioPusher.java                                                               |    8 +-
 src/share/classes/com/sun/media/sound/SoftChannel.java                                                                   |   44 +-
 src/share/classes/com/sun/media/sound/SoftChannelProxy.java                                                              |    4 +-
 src/share/classes/com/sun/media/sound/SoftChorus.java                                                                    |   14 +-
 src/share/classes/com/sun/media/sound/SoftCubicResampler.java                                                            |    4 +-
 src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java                                                         |   38 +-
 src/share/classes/com/sun/media/sound/SoftFilter.java                                                                    |    6 +-
 src/share/classes/com/sun/media/sound/SoftInstrument.java                                                                |    8 +-
 src/share/classes/com/sun/media/sound/SoftJitterCorrector.java                                                           |    8 +-
 src/share/classes/com/sun/media/sound/SoftLanczosResampler.java                                                          |    4 +-
 src/share/classes/com/sun/media/sound/SoftLimiter.java                                                                   |    4 +-
 src/share/classes/com/sun/media/sound/SoftLinearResampler.java                                                           |    4 +-
 src/share/classes/com/sun/media/sound/SoftLinearResampler2.java                                                          |    4 +-
 src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java                                                    |   24 +-
 src/share/classes/com/sun/media/sound/SoftMainMixer.java                                                                 |   26 +-
 src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java                                                       |    4 +-
 src/share/classes/com/sun/media/sound/SoftMixingClip.java                                                                |    8 +-
 src/share/classes/com/sun/media/sound/SoftMixingDataLine.java                                                            |   88 +-
 src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java                                                           |   34 +-
 src/share/classes/com/sun/media/sound/SoftMixingMixer.java                                                               |   34 +-
 src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java                                                       |    6 +-
 src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java                                                      |   10 +-
 src/share/classes/com/sun/media/sound/SoftPerformer.java                                                                 |    4 +-
 src/share/classes/com/sun/media/sound/SoftPointResampler.java                                                            |    4 +-
 src/share/classes/com/sun/media/sound/SoftProvider.java                                                                  |    8 +-
 src/share/classes/com/sun/media/sound/SoftReceiver.java                                                                  |   14 +-
 src/share/classes/com/sun/media/sound/SoftReverb.java                                                                    |   10 +-
 src/share/classes/com/sun/media/sound/SoftShortMessage.java                                                              |    4 +-
 src/share/classes/com/sun/media/sound/SoftSincResampler.java                                                             |    4 +-
 src/share/classes/com/sun/media/sound/SoftSynthesizer.java                                                               |   60 +-
 src/share/classes/com/sun/media/sound/SoftTuning.java                                                                    |    6 +-
 src/share/classes/com/sun/media/sound/SoftVoice.java                                                                     |  134 +-
 src/share/classes/com/sun/media/sound/StandardMidiFileReader.java                                                        |   29 +-
 src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java                                                        |   10 +-
 src/share/classes/com/sun/media/sound/SunCodec.java                                                                      |   18 +-
 src/share/classes/com/sun/media/sound/SunFileReader.java                                                                 |   33 +-
 src/share/classes/com/sun/media/sound/SunFileWriter.java                                                                 |   17 +-
 src/share/classes/com/sun/media/sound/Toolkit.java                                                                       |    9 +-
 src/share/classes/com/sun/media/sound/UlawCodec.java                                                                     |    9 +-
 src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java                                                      |   14 +-
 src/share/classes/com/sun/media/sound/WaveFileFormat.java                                                                |   22 +-
 src/share/classes/com/sun/media/sound/WaveFileReader.java                                                                |   34 +-
 src/share/classes/com/sun/media/sound/WaveFileWriter.java                                                                |   14 +-
 src/share/classes/com/sun/media/sound/WaveFloatFileReader.java                                                           |    4 +-
 src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java                                                           |    8 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/Init.java                                                     |  643 +++----
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/ClassLoaderUtils.java                              |  280 +++
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java                                     |  403 +++-
 src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java                            |  812 ++++----
 src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java                                       |  237 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java                                    |    7 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java                   |   22 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java                                     |   34 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java                                             |  240 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java                             |  622 +++---
 src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java |   10 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties                            |  249 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java                                     |    5 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java                                   |   10 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java                              |    3 +
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderUtils.java                              |  280 +++
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java                                     |  420 ++--
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java                                    |    9 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java         |   23 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java                 |   32 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementProxy.java                                       |  838 ++++-----
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java                                               |  338 +--
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java                                         |    2 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java                                           |  395 +++-
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java                          |  534 +++---
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java                       |   12 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java          |   98 +-
 src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java          |   66 +-
 src/share/classes/java/awt/Font.java                                                                                     |   40 +-
 src/share/classes/java/awt/image/BufferedImage.java                                                                      |   30 +-
 src/share/classes/java/awt/image/ComponentSampleModel.java                                                               |   16 +-
 src/share/classes/java/awt/image/PixelInterleavedSampleModel.java                                                        |   10 +-
 src/share/classes/java/awt/image/Raster.java                                                                             |   14 +-
 src/share/classes/java/io/ObjectOutputStream.java                                                                        |   13 +
 src/share/classes/java/io/ObjectStreamClass.java                                                                         |   18 +
 src/share/classes/java/io/ObjectStreamField.java                                                                         |    8 +
 src/share/classes/java/lang/Class.java                                                                                   |  140 +-
 src/share/classes/java/lang/ClassLoader.java                                                                             |   60 +-
 src/share/classes/java/lang/Package.java                                                                                 |   11 +-
 src/share/classes/java/lang/Runtime.java                                                                                 |    8 +-
 src/share/classes/java/lang/System.java                                                                                  |   13 +-
 src/share/classes/java/lang/Thread.java                                                                                  |   11 +-
 src/share/classes/java/lang/invoke/MemberName.java                                                                       |   13 +-
 src/share/classes/java/lang/invoke/MethodHandleImpl.java                                                                 |    8 +-
 src/share/classes/java/lang/invoke/MethodHandleNatives.java                                                              |   68 +-
 src/share/classes/java/lang/invoke/MethodHandleProxies.java                                                              |    5 +-
 src/share/classes/java/lang/invoke/MethodHandles.java                                                                    |  193 +-
 src/share/classes/java/lang/reflect/Constructor.java                                                                     |    5 +-
 src/share/classes/java/lang/reflect/Field.java                                                                           |  129 +-
 src/share/classes/java/lang/reflect/Method.java                                                                          |   19 +-
 src/share/classes/java/lang/reflect/Proxy.java                                                                           |   68 +-
 src/share/classes/java/net/NetUtil.java                                                                                  |   74 +
 src/share/classes/java/net/ServerSocket.java                                                                             |   25 +-
 src/share/classes/java/net/Socket.java                                                                                   |    8 +
 src/share/classes/java/net/SocksSocketImpl.java                                                                          |    9 +-
 src/share/classes/java/nio/file/Files.java                                                                               |   11 +-
 src/share/classes/java/rmi/dgc/VMID.java                                                                                 |   69 +-
 src/share/classes/java/security/AccessControlContext.java                                                                |   13 +-
 src/share/classes/java/security/AccessController.java                                                                    |   27 +-
 src/share/classes/java/security/KeyStore.java                                                                            |    2 +-
 src/share/classes/java/security/ProtectionDomain.java                                                                    |    7 +-
 src/share/classes/java/sql/DriverManager.java                                                                            |   68 +-
 src/share/classes/java/util/ResourceBundle.java                                                                          |   29 +-
 src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java                                             |   11 +-
 src/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java                                                |   18 +-
 src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java                                           |   13 +-
 src/share/classes/java/util/logging/LogManager.java                                                                      |   39 +-
 src/share/classes/java/util/logging/Logger.java                                                                          |   99 +-
 src/share/classes/java/util/zip/ZipFile.java                                                                             |   26 +-
 src/share/classes/javax/management/JMX.java                                                                              |   90 +-
 src/share/classes/javax/management/MBeanServerFactory.java                                                               |    3 +-
 src/share/classes/javax/management/MBeanServerInvocationHandler.java                                                     |   15 +-
 src/share/classes/javax/management/StandardEmitterMBean.java                                                             |   35 +-
 src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java                                         |    2 +
 src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java                                          |   10 +-
 src/share/classes/javax/management/relation/RelationNotification.java                                                    |  255 +-
 src/share/classes/javax/management/remote/JMXConnectorFactory.java                                                       |   39 +-
 src/share/classes/javax/management/remote/NotificationResult.java                                                        |    4 +-
 src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java                                                     |    2 +
 src/share/classes/javax/management/remote/rmi/RMIConnector.java                                                          |    5 +-
 src/share/classes/javax/script/ScriptEngineManager.java                                                                  |   48 +-
 src/share/classes/javax/sound/midi/MetaMessage.java                                                                      |   18 +-
 src/share/classes/javax/sound/sampled/Mixer.java                                                                         |    8 +-
 src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java                                                          |   19 +-
 src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java                                                      |   19 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java                                                 |    2 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java                                                     |   12 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java                                           |   18 +
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java                                                          |    9 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java                                                         |   21 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java                                                        |   36 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java                                                  |   18 +
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java                                              |    9 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java                                                |    9 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java                                                       |   35 +
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java                                                  |   42 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java                                                            |    4 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java                                                        |   10 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java                                                     |    9 +-
 src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java                                                               |   10 +
 src/share/classes/sun/applet/AppletSecurity.java                                                                         |    4 +-
 src/share/classes/sun/audio/AudioData.java                                                                               |    4 +-
 src/share/classes/sun/audio/AudioDataStream.java                                                                         |   10 +-
 src/share/classes/sun/audio/AudioDevice.java                                                                             |   16 +-
 src/share/classes/sun/audio/AudioPlayer.java                                                                             |   15 +-
 src/share/classes/sun/audio/AudioStream.java                                                                             |   14 +-
 src/share/classes/sun/audio/AudioStreamSequence.java                                                                     |    7 +-
 src/share/classes/sun/audio/AudioTranslatorStream.java                                                                   |    9 +-
 src/share/classes/sun/audio/ContinuousAudioDataStream.java                                                               |    7 +-
 src/share/classes/sun/audio/InvalidAudioFormatException.java                                                             |    8 +-
 src/share/classes/sun/awt/AppContext.java                                                                                |  111 +-
 src/share/classes/sun/awt/IconInfo.java                                                                                  |  237 ++
 src/share/classes/sun/awt/SunToolkit.java                                                                                |    4 +
 src/share/classes/sun/awt/image/ByteBandedRaster.java                                                                    |   73 +-
 src/share/classes/sun/awt/image/ByteComponentRaster.java                                                                 |   23 +-
 src/share/classes/sun/awt/image/BytePackedRaster.java                                                                    |    3 +-
 src/share/classes/sun/awt/image/IntegerComponentRaster.java                                                              |   23 +-
 src/share/classes/sun/awt/image/ShortBandedRaster.java                                                                   |   66 +-
 src/share/classes/sun/awt/image/ShortComponentRaster.java                                                                |   23 +-
 src/share/classes/sun/awt/resources/security-icon-bw16.png                                                               |  Bin 
 src/share/classes/sun/awt/resources/security-icon-bw24.png                                                               |  Bin 
 src/share/classes/sun/awt/resources/security-icon-bw32.png                                                               |  Bin 
 src/share/classes/sun/awt/resources/security-icon-bw48.png                                                               |  Bin 
 src/share/classes/sun/awt/resources/security-icon-interim16.png                                                          |  Bin 
 src/share/classes/sun/awt/resources/security-icon-interim24.png                                                          |  Bin 
 src/share/classes/sun/awt/resources/security-icon-interim32.png                                                          |  Bin 
 src/share/classes/sun/awt/resources/security-icon-interim48.png                                                          |  Bin 
 src/share/classes/sun/awt/resources/security-icon-yellow16.png                                                           |  Bin 
 src/share/classes/sun/awt/resources/security-icon-yellow24.png                                                           |  Bin 
 src/share/classes/sun/awt/resources/security-icon-yellow32.png                                                           |  Bin 
 src/share/classes/sun/awt/resources/security-icon-yellow48.png                                                           |  Bin 
 src/share/classes/sun/font/CreatedFontTracker.java                                                                       |  119 +-
 src/share/classes/sun/font/ExtendedTextSourceLabel.java                                                                  |   13 +-
 src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java                                                               |   41 +-
 src/share/classes/sun/misc/JavaUtilZipFileAccess.java                                                                    |   32 +
 src/share/classes/sun/misc/SharedSecrets.java                                                                            |   11 +
 src/share/classes/sun/misc/URLClassPath.java                                                                             |   21 +-
 src/share/classes/sun/misc/Unsafe.java                                                                                   |   12 +-
 src/share/classes/sun/net/NetworkClient.java                                                                             |    8 +-
 src/share/classes/sun/net/ftp/impl/FtpClient.java                                                                        |   21 +-
 src/share/classes/sun/net/httpserver/ServerImpl.java                                                                     |   11 +-
 src/share/classes/sun/nio/ch/AsynchronousServerSocketChannelImpl.java                                                    |   23 +-
 src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java                                                          |   27 +-
 src/share/classes/sun/nio/ch/DatagramChannelImpl.java                                                                    |   29 +-
 src/share/classes/sun/nio/ch/Net.java                                                                                    |  107 +-
 src/share/classes/sun/nio/ch/ServerSocketAdaptor.java                                                                    |    3 +-
 src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java                                                                |   40 +-
 src/share/classes/sun/nio/ch/SocketAdaptor.java                                                                          |    4 +-
 src/share/classes/sun/nio/ch/SocketChannelImpl.java                                                                      |   30 +-
 src/share/classes/sun/reflect/CallerSensitive.java                                                                       |   41 +
 src/share/classes/sun/reflect/Reflection.java                                                                            |   38 +-
 src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java                                                |    9 +-
 src/share/classes/sun/reflect/misc/ReflectUtil.java                                                                      |   54 +-
 src/share/classes/sun/rmi/server/Activation.java                                                                         |   16 +-
 src/share/classes/sun/rmi/server/LoaderHandler.java                                                                      |   33 +-
 src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java                                                             |   11 +-
 src/share/classes/sun/security/pkcs11/P11KeyAgreement.java                                                               |    6 +-
 src/share/classes/sun/security/pkcs11/P11Signature.java                                                                  |    7 +-
 src/share/classes/sun/security/pkcs11/P11Util.java                                                                       |   16 +-
 src/share/classes/sun/security/timestamp/TimestampToken.java                                                             |    6 +-
 src/share/classes/sun/security/util/KeyUtil.java                                                                         |   21 +-
 src/share/classes/sun/security/util/SignatureFileVerifier.java                                                           |   29 +-
 src/share/classes/sun/tools/jconsole/ProxyClient.java                                                                    |   15 +-
 src/share/classes/sun/tools/jconsole/VMPanel.java                                                                        |   11 +-
 src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java                                                    |    5 +
 src/share/classes/sun/tracing/ProviderSkeleton.java                                                                      |   31 +-
 src/share/classes/sun/tracing/dtrace/DTraceProvider.java                                                                 |   15 +-
 src/share/lib/security/java.security                                                                                     |    8 +-
 src/share/lib/security/java.security-solaris                                                                             |    8 +-
 src/share/lib/security/java.security-windows                                                                             |    4 +
 src/share/native/common/sizecalc.h                                                                                       |  118 +
 src/share/native/java/lang/ClassLoader.c                                                                                 |   17 -
 src/share/native/java/lang/SecurityManager.c                                                                             |    1 -
 src/share/native/java/util/zip/ZipFile.c                                                                                 |    8 +
 src/share/native/java/util/zip/zip_util.c                                                                                |    8 +
 src/share/native/java/util/zip/zip_util.h                                                                                |    1 +
 src/share/native/sun/awt/image/awt_parseImage.c                                                                          |  167 +-
 src/share/native/sun/awt/medialib/awt_ImagingLib.c                                                                       |  466 +++-
 src/share/native/sun/awt/medialib/mlib_ImageCreate.c                                                                     |   31 +-
 src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c                                                            |    3 +-
 src/share/native/sun/awt/splashscreen/splashscreen_gif.c                                                                 |    6 +-
 src/share/native/sun/font/freetypeScaler.c                                                                               |   13 +-
 src/share/native/sun/font/layout/LEGlyphStorage.cpp                                                                      |   16 +-
 src/share/native/sun/font/layout/LookupProcessor.cpp                                                                     |    2 +-
 src/share/native/sun/font/layout/PairPositioningSubtables.cpp                                                            |   27 +-
 src/share/native/sun/font/layout/PairPositioningSubtables.h                                                              |    5 +-
 src/share/native/sun/java2d/cmm/lcms/cmslut.c                                                                            |    3 +
 src/share/native/sun/java2d/cmm/lcms/cmsnamed.c                                                                          |   10 +-
 src/share/native/sun/java2d/cmm/lcms/cmsopt.c                                                                            |    9 +
 src/share/native/sun/java2d/pipe/Region.c                                                                                |    5 +-
 src/share/native/sun/reflect/Reflection.c                                                                                |    6 +-
 src/solaris/classes/sun/awt/X11/XDecoratedPeer.java                                                                      |    5 +-
 src/solaris/classes/sun/awt/X11/XIconInfo.java                                                                           |  237 --
 src/solaris/classes/sun/awt/X11/XIconWindow.java                                                                         |    9 +-
 src/solaris/classes/sun/awt/X11/XNETProtocol.java                                                                        |   12 +-
 src/solaris/classes/sun/awt/X11/XWM.java                                                                                 |    5 +-
 src/solaris/classes/sun/awt/X11/XWarningWindow.java                                                                      |   65 +-
 src/solaris/classes/sun/awt/X11/XWindowAttributesData.java                                                               |    7 +-
 src/solaris/classes/sun/awt/X11/XWindowPeer.java                                                                         |   47 +-
 src/solaris/classes/sun/awt/X11/security-icon-bw16.png                                                                   |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-bw24.png                                                                   |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-bw32.png                                                                   |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-bw48.png                                                                   |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-interim16.png                                                              |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-interim24.png                                                              |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-interim32.png                                                              |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-interim48.png                                                              |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-yellow16.png                                                               |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-yellow24.png                                                               |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-yellow32.png                                                               |  Bin 
 src/solaris/classes/sun/awt/X11/security-icon-yellow48.png                                                               |  Bin 
 src/solaris/classes/sun/nio/ch/SctpNet.java                                                                              |   62 +-
 src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java                                                    |    2 +-
 src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java                                                                |    3 +-
 src/solaris/native/sun/awt/awt_GraphicsEnv.c                                                                             |    5 +-
 src/solaris/native/sun/awt/awt_GraphicsEnv.h                                                                             |    3 +
 src/solaris/native/sun/awt/awt_Robot.c                                                                                   |    8 +-
 src/solaris/native/sun/awt/awt_UNIXToolkit.c                                                                             |   10 +-
 src/solaris/native/sun/awt/fontpath.c                                                                                    |   12 +-
 src/solaris/native/sun/awt/gtk2_interface.c                                                                              |    4 +-
 src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c                                                               |   22 +-
 src/solaris/native/sun/java2d/x11/X11SurfaceData.c                                                                       |   11 +-
 src/solaris/native/sun/nio/ch/Net.c                                                                                      |    9 +-
 src/solaris/native/sun/xawt/XlibWrapper.c                                                                                |   10 +-
 src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java                                                       |   51 +-
 src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java                                                       |   32 +-
 src/windows/classes/java/net/DualStackPlainSocketImpl.java                                                               |   32 +-
 src/windows/classes/java/net/PlainSocketImpl.java                                                                        |   25 +-
 src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java                                                       |   47 +-
 src/windows/classes/java/net/TwoStacksPlainSocketImpl.java                                                               |   39 +-
 src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java                                                 |    4 +-
 src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c                                                           |    5 +-
 src/windows/native/java/net/DualStackPlainSocketImpl.c                                                                   |    6 +-
 src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c                                                           |   11 +-
 src/windows/native/java/net/TwoStacksPlainSocketImpl.c                                                                   |   13 +-
 src/windows/native/java/net/net_util_md.c                                                                                |   65 +-
 src/windows/native/java/net/net_util_md.h                                                                                |    5 +-
 src/windows/native/sun/awt/splashscreen/splashscreen_sys.c                                                               |   31 +-
 src/windows/native/sun/font/lcdglyph.c                                                                                   |   10 +-
 src/windows/native/sun/java2d/opengl/WGLSurfaceData.c                                                                    |    3 +-
 src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp                                                                   |    1 +
 src/windows/native/sun/java2d/windows/GDIRenderer.cpp                                                                    |    2 +-
 src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp                                                           |    5 +-
 src/windows/native/sun/nio/ch/Net.c                                                                                      |   18 +-
 src/windows/native/sun/windows/CmdIDList.cpp                                                                             |    6 +-
 src/windows/native/sun/windows/Devices.cpp                                                                               |    7 +-
 src/windows/native/sun/windows/ShellFolder2.cpp                                                                          |    6 +
 src/windows/native/sun/windows/WPrinterJob.cpp                                                                           |    2 +-
 src/windows/native/sun/windows/alloc.h                                                                                   |    3 +
 src/windows/native/sun/windows/awt.h                                                                                     |    6 +-
 src/windows/native/sun/windows/awt_BitmapUtil.cpp                                                                        |   14 +-
 src/windows/native/sun/windows/awt_Component.cpp                                                                         |   45 +-
 src/windows/native/sun/windows/awt_Cursor.cpp                                                                            |    6 +-
 src/windows/native/sun/windows/awt_DataTransferer.cpp                                                                    |   12 +-
 src/windows/native/sun/windows/awt_DesktopProperties.cpp                                                                 |    6 +-
 src/windows/native/sun/windows/awt_DnDDT.cpp                                                                             |    4 +-
 src/windows/native/sun/windows/awt_InputMethod.cpp                                                                       |    8 +-
 src/windows/native/sun/windows/awt_PrintControl.cpp                                                                      |    4 +-
 src/windows/native/sun/windows/awt_PrintJob.cpp                                                                          |   17 +-
 src/windows/native/sun/windows/awt_Robot.cpp                                                                             |    5 +
 test/Makefile                                                                                                            |    4 +-
 test/ProblemList.txt                                                                                                     |    1 -
 test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java                                            |   22 +-
 test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java                                                     |   45 +-
 test/java/rmi/Naming/LookupNameWithColon.java                                                                            |   18 +-
 test/java/rmi/Naming/RmiIsNoScheme.java                                                                                  |   12 +-
 test/java/rmi/Naming/UnderscoreHost.java                                                                                 |   71 +-
 test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java                                                          |    6 +-
 test/java/rmi/activation/Activatable/checkActivateRef/security.policy                                                    |    3 +-
 test/java/rmi/activation/Activatable/checkAnnotations/security.policy                                                    |    3 +-
 test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy                                                |    3 +-
 test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy                                                  |    5 +-
 test/java/rmi/activation/Activatable/createPrivateActivable/security.policy                                              |    3 +-
 test/java/rmi/activation/Activatable/downloadParameterClass/security.policy                                              |    3 +-
 test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy                                               |    3 +-
 test/java/rmi/activation/Activatable/extLoadedImpl/security.policy                                                       |    3 +-
 test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy                                                    |    3 +-
 test/java/rmi/activation/Activatable/inactiveGroup/security.policy                                                       |    5 +-
 test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java                                  |    4 +-
 test/java/rmi/activation/Activatable/nestedActivate/security.policy                                                      |    5 +-
 test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy                                              |    3 +-
 test/java/rmi/activation/Activatable/restartCrashedService/security.policy                                               |    3 +-
 test/java/rmi/activation/Activatable/restartLatecomer/security.policy                                                    |    3 +-
 test/java/rmi/activation/Activatable/restartService/security.policy                                                      |    3 +-
 test/java/rmi/activation/Activatable/shutdownGracefully/security.policy                                                  |    3 +-
 test/java/rmi/activation/Activatable/unregisterInactive/security.policy                                                  |    3 +-
 test/java/rmi/activation/ActivateFailedException/activateFails/security.policy                                           |    3 +-
 test/java/rmi/activation/ActivationSystem/activeGroup/security.policy                                                    |    3 +-
 test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy                                               |    3 +-
 test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java                                 |   10 +-
 test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy                                           |    9 +-
 test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java                                           |    9 +-
 test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy                                                |    3 +-
 test/java/rmi/activation/CommandEnvironment/SetChildEnv.java                                                             |   37 +-
 test/java/rmi/activation/CommandEnvironment/security.policy                                                              |    1 +
 test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java                                    |   20 +-
 test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java                                            |   23 +-
 test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy                                                    |    1 +
 test/java/rmi/registry/altSecurityManager/AltSecurityManager.java                                                        |   45 +-
 test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java                                                          |   11 +-
 test/java/rmi/registry/emptyName/EmptyName.java                                                                          |    6 +-
 test/java/rmi/registry/interfaceHash/InterfaceHash.java                                                                  |    6 +-
 test/java/rmi/registry/multipleRegistries/MultipleRegistries.java                                                        |   15 +-
 test/java/rmi/registry/readTest/readTest.java                                                                            |    9 +-
 test/java/rmi/registry/readTest/readTest.sh                                                                              |    5 +-
 test/java/rmi/registry/reexport/Reexport.java                                                                            |   25 +-
 test/java/rmi/reliability/juicer/AppleUserImpl.java                                                                      |   22 +-
 test/java/rmi/reliability/juicer/ApplicationServer.java                                                                  |   27 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java                                         |    7 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java                           |   16 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy                                       |    3 +
 test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java                                           |    5 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java                              |   14 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy                                          |    2 +
 test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java                                             |    5 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java                               |   15 +-
 test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy                                           |    9 +
 test/java/rmi/server/RemoteServer/AddrInUse.java                                                                         |   12 +-
 test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java                                    |   10 +-
 test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java                                           |    5 +-
 test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java                                                |   12 +-
 test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java                                                   |    9 +-
 test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java                                             |    8 +-
 test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java                                                 |    6 +-
 test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java                                           |    8 +-
 test/java/rmi/server/useCustomRef/UseCustomRef.java                                                                      |    8 +-
 test/java/rmi/server/useCustomRef/security.policy                                                                        |    3 +
 test/java/rmi/testlibrary/ActivationLibrary.java                                                                         |   39 +-
 test/java/rmi/testlibrary/RMID.java                                                                                      |   25 +-
 test/java/rmi/testlibrary/RegistryRunner.java                                                                            |    9 +-
 test/java/rmi/testlibrary/StreamPipe.java                                                                                |    2 +-
 test/java/rmi/testlibrary/TestLibrary.java                                                                               |  132 +-
 test/java/rmi/transport/checkFQDN/CheckFQDN.java                                                                         |   13 +-
 test/java/rmi/transport/checkFQDN/CheckFQDNClient.java                                                                   |    5 +-
 test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java                                                           |   13 +-
 test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java                                                          |    6 +-
 test/java/rmi/transport/checkLeaseInfoLeak/security.policy                                                               |    1 +
 test/java/rmi/transport/closeServerSocket/CloseServerSocket.java                                                         |   10 +-
 test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java                                                                     |   13 +-
 test/java/rmi/transport/dgcDeadLock/TestImpl.java                                                                        |   10 +-
 test/java/rmi/transport/handshakeFailure/HandshakeFailure.java                                                           |    7 +-
 test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java                                                           |    7 +-
 test/java/rmi/transport/httpSocket/HttpSocketTest.java                                                                   |   16 +-
 test/java/rmi/transport/httpSocket/security.policy                                                                       |    4 +
 test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java                                               |    6 +-
 test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java                                                     |    9 +-
 test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java                                                           |    7 +-
 test/javax/xml/crypto/dsig/GenerationTests.java                                                                          |    6 +-
 test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java                                                        |    7 +-
 test/javax/xml/crypto/dsig/ValidationTests.java                                                                          |    4 +-
 test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java                                                              |  248 ++
 test/sun/reflect/CallerSensitive/ClassFileReader.java                                                                    |  338 ++++
 test/sun/reflect/CallerSensitive/MethodFinder.java                                                                       |  201 ++
 test/sun/reflect/CallerSensitive/MissingCallerSensitive.java                                                             |   73 +
 test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java                                                                 |   17 +-
 test/sun/rmi/rmic/newrmic/equivalence/run.sh                                                                             |    4 +-
 test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java                                                                    |    8 +-
 test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java                                                                  |   11 +-
 test/sun/rmi/transport/proxy/EagerHttpFallback.java                                                                      |    8 +-
 test/sun/rmi/transport/tcp/DeadCachedConnection.java                                                                     |    4 +-
 test/tools/launcher/Arrrghs.java                                                                                         |   10 +-
 516 files changed, 10575 insertions(+), 6661 deletions(-)

diffs (truncated from 32551 to 500 lines):

diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/FILES_c.gmk
--- a/make/java/java/FILES_c.gmk	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/java/FILES_c.gmk	Tue Jun 18 08:07:48 2013 -0500
@@ -48,7 +48,6 @@
 	Proxy.c \
 	RandomAccessFile.c \
 	RandomAccessFile_md.c \
-	ResourceBundle.c \
 	Runtime.c \
 	SecurityManager.c \
 	Shutdown.c \
@@ -69,7 +68,6 @@
 	jdk_util_md.c \
 	check_version.c \
 	java_props_md.c \
-	DriverManager.c \
 	ConstantPool.c \
 	MessageUtils.c \
 	GC.c \
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/mapfile-vers
--- a/make/java/java/mapfile-vers	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/java/mapfile-vers	Tue Jun 18 08:07:48 2013 -0500
@@ -135,7 +135,6 @@
 		Java_java_lang_ClassLoader_00024NativeLibrary_find;
 		Java_java_lang_ClassLoader_00024NativeLibrary_load;
 		Java_java_lang_ClassLoader_00024NativeLibrary_unload;
-		Java_java_lang_ClassLoader_getCaller; 
 		Java_java_lang_ClassLoader_registerNatives;
 		Java_java_lang_Compiler_registerNatives;
 		Java_java_lang_Double_longBitsToDouble;
@@ -233,8 +232,6 @@
 		Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedExceptionAction_2Ljava_security_AccessControlContext_2;
 		Java_java_security_AccessController_getStackAccessControlContext;
 		Java_java_security_AccessController_getInheritedAccessControlContext;
-		Java_java_sql_DriverManager_getCallerClassLoader;
-		Java_java_util_ResourceBundle_getClassContext;
 		Java_java_util_TimeZone_getSystemTimeZoneID;
 		Java_java_util_TimeZone_getSystemGMTOffsetID;
 		Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/reorder-i586
--- a/make/java/java/reorder-i586	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/java/reorder-i586	Tue Jun 18 08:07:48 2013 -0500
@@ -73,7 +73,6 @@
 # Test Sleep
 # Test IntToString
 # Test LoadToolkit
-text: .text%Java_java_util_ResourceBundle_getClassContext;
 text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
 text: .text%JNU_GetEnv;
 text: .text%Java_java_io_UnixFileSystem_checkAccess;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/reorder-sparc
--- a/make/java/java/reorder-sparc	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/java/reorder-sparc	Tue Jun 18 08:07:48 2013 -0500
@@ -78,7 +78,6 @@
 # Test Sleep
 # Test IntToString
 # Test LoadToolkit
-text: .text%Java_java_util_ResourceBundle_getClassContext;
 text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
 text: .text%JNU_GetEnv;
 text: .text%Java_java_io_UnixFileSystem_checkAccess;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/java/reorder-sparcv9
--- a/make/java/java/reorder-sparcv9	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/java/reorder-sparcv9	Tue Jun 18 08:07:48 2013 -0500
@@ -74,7 +74,6 @@
 # Test Sleep
 # Test IntToString
 # Test LoadToolkit
-text: .text%Java_java_util_ResourceBundle_getClassContext;
 text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2;
 text: .text%JNU_GetEnv;
 text: .text%Java_java_io_UnixFileSystem_checkAccess;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/nio/mapfile-linux
--- a/make/java/nio/mapfile-linux	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/nio/mapfile-linux	Tue Jun 18 08:07:48 2013 -0500
@@ -115,6 +115,7 @@
 		Java_sun_nio_ch_Net_setInterface6;
 		Java_sun_nio_ch_Net_getInterface6;
 		Java_sun_nio_ch_Net_shutdown;
+                Java_sun_nio_ch_Net_isExclusiveBindAvailable;
                 Java_sun_nio_ch_PollArrayWrapper_interrupt;
                 Java_sun_nio_ch_PollArrayWrapper_poll0;
                 Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/nio/mapfile-solaris
--- a/make/java/nio/mapfile-solaris	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/nio/mapfile-solaris	Tue Jun 18 08:07:48 2013 -0500
@@ -103,6 +103,7 @@
 		Java_sun_nio_ch_Net_setInterface6;
 		Java_sun_nio_ch_Net_getInterface6;
 		Java_sun_nio_ch_Net_shutdown;
+                Java_sun_nio_ch_Net_isExclusiveBindAvailable;
                 Java_sun_nio_ch_PollArrayWrapper_interrupt;
                 Java_sun_nio_ch_PollArrayWrapper_poll0;
                 Java_sun_nio_ch_ServerSocketChannelImpl_accept0;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/mapfile-vers
--- a/make/java/zip/mapfile-vers	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/zip/mapfile-vers	Tue Jun 18 08:07:48 2013 -0500
@@ -67,6 +67,7 @@
 		Java_java_util_zip_ZipFile_initIDs;
 		Java_java_util_zip_ZipFile_open;
 		Java_java_util_zip_ZipFile_read;
+		Java_java_util_zip_ZipFile_startsWithLOC;
 
 		ZIP_Close;
 		ZIP_CRC32;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/reorder-i586
--- a/make/java/zip/reorder-i586	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/zip/reorder-i586	Tue Jun 18 08:07:48 2013 -0500
@@ -19,6 +19,7 @@
 text: .text%Java_java_util_zip_ZipFile_initIDs;
 text: .text%Java_java_util_zip_ZipFile_open;
 text: .text%Java_java_util_zip_ZipFile_getTotal;
+text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
 text: .text%Java_java_util_zip_ZipFile_getEntry;
 text: .text%Java_java_util_zip_ZipFile_freeEntry;
 text: .text%Java_java_util_zip_ZipFile_getEntryTime;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/reorder-sparc
--- a/make/java/zip/reorder-sparc	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/zip/reorder-sparc	Tue Jun 18 08:07:48 2013 -0500
@@ -18,6 +18,7 @@
 text: .text%Java_java_util_zip_ZipFile_initIDs;
 text: .text%Java_java_util_zip_ZipFile_open;
 text: .text%Java_java_util_zip_ZipFile_getTotal;
+text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
 text: .text%Java_java_util_zip_ZipFile_getEntry;
 text: .text%Java_java_util_zip_ZipFile_freeEntry;
 text: .text%Java_java_util_zip_ZipFile_getEntryTime;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/java/zip/reorder-sparcv9
--- a/make/java/zip/reorder-sparcv9	Wed May 30 16:17:48 2012 +0100
+++ b/make/java/zip/reorder-sparcv9	Tue Jun 18 08:07:48 2013 -0500
@@ -18,6 +18,7 @@
 text: .text%Java_java_util_zip_ZipFile_initIDs;
 text: .text%Java_java_util_zip_ZipFile_open;
 text: .text%Java_java_util_zip_ZipFile_getTotal;
+text: .text%Java_java_util_zip_ZipFile_startsWithLOC;
 text: .text%Java_java_util_zip_ZipFile_getEntry;
 text: .text%Java_java_util_zip_ZipFile_freeEntry;
 text: .text%Java_java_util_zip_ZipFile_getEntryTime;
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/awt/Makefile
--- a/make/sun/awt/Makefile	Wed May 30 16:17:48 2012 +0100
+++ b/make/sun/awt/Makefile	Tue Jun 18 08:07:48 2013 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,6 +38,10 @@
 
 OTHER_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES
 
+ifneq  ($(PLATFORM), windows)
+CLASSES_INIT += $(TEMPDIR)/.gen_icons
+endif
+
 #
 # Files
 #
@@ -180,6 +184,79 @@
 endif
 build: fontconfigs
 
+ifneq ($(PLATFORM), windows)
+
+GEN_DIR=$(GENSRCDIR)/sun/awt/
+
+ifdef OPENJDK
+    ICONS_PATH_PREFIX=$(PLATFORM_SRC)
+else
+    ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris
+endif
+
+ICONS = \
+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
+    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
+
+ICONPATH=$(SHARE_SRC)/classes/sun/awt/resources
+
+ICONS += \
+   $(ICONPATH)/security-icon-bw16.png \
+   $(ICONPATH)/security-icon-interim16.png \
+   $(ICONPATH)/security-icon-yellow16.png \
+   $(ICONPATH)/security-icon-bw24.png \
+   $(ICONPATH)/security-icon-interim24.png \
+   $(ICONPATH)/security-icon-yellow24.png \
+   $(ICONPATH)/security-icon-bw32.png \
+   $(ICONPATH)/security-icon-interim32.png \
+   $(ICONPATH)/security-icon-yellow32.png \
+   $(ICONPATH)/security-icon-bw48.png \
+   $(ICONPATH)/security-icon-interim48.png \
+   $(ICONPATH)/security-icon-yellow48.png
+
+TEMPDIR_CLASSES = $(TEMPDIR)/classes
+   
+generated.clean:
+	$(RM) -r $(GEN_DIR)/*.java
+	$(RM) -r $(TEMPDIR)/.gen_icons   
+
+$(TEMPDIR_CLASSES)/sun/awt/ToBin.class: ToBin.java
+	@$(prep-target)
+	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
+
+$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/ToBin.class $(ICONS)
+	$(prep-target)
+	for i in $(ICONS); do \
+            filename=`basename $$i`; \
+	    name=`$(ECHO) $$filename | $(TR) '\-.' '__'`;  \
+            classname=$(GEN_DIR)/AWTIcon32_$$name.java; \
+	    $(RM) $$classname; \
+	    $(ECHO) "package sun.awt;" >> $$classname ; \
+	    $(ECHO) "public class AWTIcon32_$$name {" >> $$classname; \
+	    $(ECHO) "public final static int[] $$name = { " >> $$classname;  \
+	    $(CAT) $$i | \
+	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
+		-Djava.awt.headless=true \
+		sun.awt.ToBin >> $$classname; \
+	    $(ECHO) "}; }" >> $$classname;  \
+            classname=$(GEN_DIR)/AWTIcon64_$$name.java; \
+	    $(RM) $$classname; \
+	    $(ECHO) "package sun.awt;" >> $$classname ; \
+	    $(ECHO) "public class AWTIcon64_$$name {" >> $$classname; \
+	    $(ECHO) "public final static long[] $$name = { " >> $$classname;  \
+	    $(CAT) $$i | \
+	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
+		-Djava.awt.headless=true \
+		sun.awt.ToBin >> $$classname; \
+	    $(ECHO) "}; }" >> $$classname;  \
+	done
+	$(TOUCH) $@
+
+clean clobber:: generated.clean    
+endif
+
 
 ifeq ($(PLATFORM), windows)
 # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
@@ -517,5 +594,5 @@
 		  java.lang.Integer \
 		  java.lang.ThreadGroup
 
-.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean
+.PHONY: dgalibs dgalib.clean fontconfigs fontconfigs.clean generated.clean
 
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/awt/ToBin.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/sun/awt/ToBin.java	Tue Jun 18 08:07:48 2013 -0500
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.awt;
+
+import java.io.*;
+import java.awt.image.*;
+import javax.imageio.*;
+import java.awt.*;
+
+public class ToBin {
+    public static void main(String[] args) throws Exception {
+        BufferedImage im = ImageIO.read(System.in);
+        BufferedImage bi = null;
+        int iconWidth = im.getWidth(null);
+        int iconHeight = im.getHeight(null);
+        if (im != null && iconHeight != 0 &&  iconWidth != 0) {
+            bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
+            Graphics g = bi.getGraphics();
+            try {
+                g.drawImage(im, 0, 0, iconWidth, iconHeight, null);
+            } finally {
+                g.dispose();
+            }
+        }
+        DataBuffer srcBuf = bi.getData().getDataBuffer();
+        int[] buf = ((DataBufferInt)srcBuf).getData();
+        System.out.print(iconWidth + ",");
+        System.out.println(iconHeight + ",");
+        for (int i = 0; i < buf.length; i++) {
+            System.out.print("0x" + Integer.toHexString(buf[i]) + ", ");
+            if (i % 10 == 0) {
+                System.out.println();
+            }
+        }
+    }
+}
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/xawt/Makefile
--- a/make/sun/xawt/Makefile	Wed May 30 16:17:48 2012 +0100
+++ b/make/sun/xawt/Makefile	Tue Jun 18 08:07:48 2013 -0500
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 
 GEN_DIR=$(GENSRCDIR)/sun/awt/X11
 
-CLASSES_INIT += $(TEMPDIR)/.gen.wrappers $(TEMPDIR)/.gen_icons touch.wrappers
+CLASSES_INIT += $(TEMPDIR)/.gen.wrappers touch.wrappers
 
 .PHONY: generated.clean
 
@@ -354,70 +354,7 @@
 	$(RM) -r $(WRAPPER_GENERATOR_TEMPDIR)
 	$(RM) -r $(WRAPPER_GENERATOR_DIR)
 	$(RM) -r $(GEN_DIR)/*.java
-	$(RM) -r $(TEMPDIR)/.gen_icons
 
-ifdef OPENJDK
-    ICONS_PATH_PREFIX=$(PLATFORM_SRC)
-else
-    ICONS_PATH_PREFIX=$(CLOSED_SRC)/solaris
-endif
-
-ICONS = \
-    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
-    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon24.png \
-    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon32.png \
-    $(ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
-
-
-ICONPATH=$(PLATFORM_SRC)/classes/sun/awt/X11
-
-ICONS += \
-   $(ICONPATH)/security-icon-bw16.png \
-   $(ICONPATH)/security-icon-interim16.png \
-   $(ICONPATH)/security-icon-yellow16.png \
-   $(ICONPATH)/security-icon-bw24.png \
-   $(ICONPATH)/security-icon-interim24.png \
-   $(ICONPATH)/security-icon-yellow24.png \
-   $(ICONPATH)/security-icon-bw32.png \
-   $(ICONPATH)/security-icon-interim32.png \
-   $(ICONPATH)/security-icon-yellow32.png \
-   $(ICONPATH)/security-icon-bw48.png \
-   $(ICONPATH)/security-icon-interim48.png \
-   $(ICONPATH)/security-icon-yellow48.png
-
-TEMPDIR_CLASSES = $(TEMPDIR)/classes
-
-$(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class: ToBin.java
-	@$(prep-target)
-	$(BOOT_JAVAC_CMD) -d $(TEMPDIR_CLASSES) $<
-
-$(TEMPDIR)/.gen_icons: $(TEMPDIR_CLASSES)/sun/awt/X11/ToBin.class $(ICONS)
-	$(prep-target)
-	for i in $(ICONS); do \
-            filename=`basename $$i`; \
-	    name=`$(ECHO) $$filename | $(TR) '\-.' '__'`;  \
-            classname=$(GEN_DIR)/XAWTIcon32_$$name.java; \
-	    $(RM) $$classname; \
-	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
-	    $(ECHO) "public class XAWTIcon32_$$name {" >> $$classname; \
-	    $(ECHO) "public static int[] $$name = { " >> $$classname;  \
-	    $(CAT) $$i | \
-	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
-		-Djava.awt.headless=true \
-		sun.awt.X11.ToBin >> $$classname; \
-	    $(ECHO) "}; }" >> $$classname;  \
-            classname=$(GEN_DIR)/XAWTIcon64_$$name.java; \
-	    $(RM) $$classname; \
-	    $(ECHO) "package sun.awt.X11;" >> $$classname ; \
-	    $(ECHO) "public class XAWTIcon64_$$name {" >> $$classname; \
-	    $(ECHO) "public static long[] $$name = { " >> $$classname;  \
-	    $(CAT) $$i | \
-	      $(BOOT_JAVA_CMD) -cp $(TEMPDIR_CLASSES)  \
-		-Djava.awt.headless=true \
-		sun.awt.X11.ToBin >> $$classname; \
-	    $(ECHO) "}; }" >> $$classname;  \
-	done
-	$(TOUCH) $@
 
 clean clobber:: generated.clean
 
diff -r 2c423d0b1965 -r 4a67dd684bc2 make/sun/xawt/ToBin.java
--- a/make/sun/xawt/ToBin.java	Wed May 30 16:17:48 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.awt.X11;
-
-import java.io.*;
-import java.awt.image.*;
-import javax.imageio.*;
-import java.awt.*;
-
-public class ToBin {
-    public static void main(String[] args) throws Exception {
-        BufferedImage im = ImageIO.read(System.in);
-        BufferedImage bi = null;
-        int iconWidth = im.getWidth(null);
-        int iconHeight = im.getHeight(null);
-        if (im != null && iconHeight != 0 &&  iconWidth != 0) {
-            bi = new BufferedImage(iconWidth, iconHeight, BufferedImage.TYPE_INT_ARGB);
-            Graphics g = bi.getGraphics();
-            try {
-                g.drawImage(im, 0, 0, iconWidth, iconHeight, null);
-            } finally {
-                g.dispose();
-            }
-        }
-        DataBuffer srcBuf = bi.getData().getDataBuffer();
-        int[] buf = ((DataBufferInt)srcBuf).getData();
-        System.out.print(iconWidth + ",");
-        System.out.println(iconHeight + ",");
-        for (int i = 0; i < buf.length; i++) {
-            System.out.print("0x" + Integer.toHexString(buf[i]) + ", ");
-            if (i % 10 == 0) {
-                System.out.println();
-            }
-        }
-    }
-}
diff -r 2c423d0b1965 -r 4a67dd684bc2 src/share/bin/java.c
--- a/src/share/bin/java.c	Wed May 30 16:17:48 2012 +0100
+++ b/src/share/bin/java.c	Tue Jun 18 08:07:48 2013 -0500
@@ -714,6 +714,13 @@
     char *def;
     const char *orig = s;
     static const char format[] = "-Djava.class.path=%s";
+    /*
+     * usually we should not get a null pointer, but there are cases where
+     * we might just get one, in which case we simply ignore it, and let the
+     * caller deal with it
+     */
+    if (s == NULL)
+        return;
     s = JLI_WildcardExpandClasspath(s);
     def = JLI_MemAlloc(sizeof(format)
                        - 2 /* strlen("%s") */
diff -r 2c423d0b1965 -r 4a67dd684bc2 src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
--- a/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java	Wed May 30 16:17:48 2012 +0100
+++ b/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java	Tue Jun 18 08:07:48 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -407,8 +407,9 @@
             }
             return skey;
         } else if (algorithm.equals("TlsPremasterSecret")) {
-            // return entire secret
-            return new SecretKeySpec(secret, "TlsPremasterSecret");
+            // remove leading zero bytes per RFC 5246 Section 8.1.2
+            return new SecretKeySpec(
+                        KeyUtil.trimZeroes(secret), "TlsPremasterSecret");
         } else {
             throw new NoSuchAlgorithmException("Unsupported secret key "



More information about the distro-pkg-dev mailing list