svn commit: r343555 - in head/java/openjdk7: . files
Greg Lewis
glewis at FreeBSD.org
Sun Feb 9 23:12:12 UTC 2014
Author: glewis
Date: Sun Feb 9 23:12:11 2014
New Revision: 343555
URL: http://svnweb.freebsd.org/changeset/ports/343555
QAT: https://qat.redports.org/buildarchive/r343555/
Log:
. Update to 7u51.
. Mark as FORBIDDEN for releases without the MAP_STACK fix (or where that
fix isn't detectable), since kernel panics may result there.
Deleted:
head/java/openjdk7/files/patch-set-jdk
Modified:
head/java/openjdk7/Makefile
head/java/openjdk7/distinfo
head/java/openjdk7/files/patch-set
head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp
Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile Sun Feb 9 23:10:58 2014 (r343554)
+++ head/java/openjdk7/Makefile Sun Feb 9 23:12:11 2014 (r343555)
@@ -3,7 +3,6 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
@@ -39,12 +38,12 @@ DEBUG_DESC= Enable extra debugging info
POLICY_DESC= Install the Unlimited Strength Policy Files
TZUPDATE_DESC= Update the time zone data
-PORT_MINOR_VERSION= 25
-PORT_BUILD_NUMBER= 15
+PORT_MINOR_VERSION= 51
+PORT_BUILD_NUMBER= 13
JDK_MAJOR_VERSION= 7
-JDK_MINOR_VERSION= 6
-JDK_BUILD_NUMBER= 24
-JDK_BUILD_DATE= 09_aug_2012
+JDK_MINOR_VERSION= 40
+JDK_BUILD_NUMBER= 43
+JDK_BUILD_DATE= 26_aug_2013
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
@@ -104,22 +103,14 @@ BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
${LOCALBASE}/openjdk6 \
${LOCALBASE}/bootstrap-openjdk
-SECURITY_ICONS= security-icon-bw16.png \
- security-icon-bw24.png \
- security-icon-bw32.png \
- security-icon-bw48.png \
- security-icon-interim16.png \
- security-icon-interim24.png \
- security-icon-interim32.png \
- security-icon-interim48.png \
- security-icon-yellow16.png \
- security-icon-yellow24.png \
- security-icon-yellow32.png \
- security-icon-yellow48.png
-
NO_STAGE= yes
+
.include <bsd.port.options.mk>
+.if ${OSVERSION} < 902506 || (${OSVERSION} > 1000000 && ${OSVERSION} < 1000702)
+FORBIDDEN= causes kernel panics
+.endif
+
.if empty(PORT_OPTIONS:MDEBUG)
MAKE_ENV+= ALT_OBJCOPY="/nonexistent"
.endif
@@ -150,14 +141,6 @@ PATCH_DEPENDS+= gpatch:${PORTSDIR}/devel
PATCH= gpatch
.endif
-post-extract:
- # Move icons to their new home.
- @${MKDIR} ${WRKSRC}/jdk/src/share/classes/sun/awt/resources
-.for icon in ${SECURITY_ICONS}
- @${MV} ${WRKSRC}/jdk/src/solaris/classes/sun/awt/X11/${icon} \
- ${WRKSRC}/jdk/src/share/classes/sun/awt/resources/
-.endfor
-
post-patch:
@${REINPLACE_CMD} "s|%%LOCALBASE%%|${LOCALBASE}|" \
${WRKSRC}/hotspot/src/os/bsd/vm/os_bsd.cpp
Modified: head/java/openjdk7/distinfo
==============================================================================
--- head/java/openjdk7/distinfo Sun Feb 9 23:10:58 2014 (r343554)
+++ head/java/openjdk7/distinfo Sun Feb 9 23:12:11 2014 (r343555)
@@ -1,4 +1,4 @@
-SHA256 (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 22aec9bcc660d2e6502c9d24e5fdac97da9c4d251dafd87f708bcf6dabbbb431
-SIZE (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914
+SHA256 (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 00f8ea561876cbcad174ba3ca7a9ae10b50df46a782ac64c2ac57ac357b50596
+SIZE (openjdk-7u40-fcs-src-b43-26_aug_2013.zip) = 104575196
SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479
SIZE (apache-ant-1.8.4-bin.zip) = 8043520
Modified: head/java/openjdk7/files/patch-set
==============================================================================
--- head/java/openjdk7/files/patch-set Sun Feb 9 23:10:58 2014 (r343554)
+++ head/java/openjdk7/files/patch-set Sun Feb 9 23:12:11 2014 (r343555)
@@ -1,5 +1,5 @@
---- .hgtags 2012-08-10 09:07:00.000000000 -0700
-+++ .hgtags 2013-06-22 09:41:03.000000000 -0700
+--- .hgtags 2013-09-06 11:20:33.000000000 -0700
++++ .hgtags 2014-01-18 12:16:04.000000000 -0800
@@ -123,6 +123,7 @@
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
@@ -8,90 +8,89 @@
34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
-@@ -197,5 +198,79 @@
- 29f6fb1833eb2a696b95e8985126f2d70f511a82 jdk7u6-b21
- 31cdab09d719fe60876c7f3a472386c1455d93e2 jdk7u6-b22
- d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23
--1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01
--d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02
-+e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24
-+f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30
-+43775eae8df6c874fb3631c86009505cf3821b1f jdk7u6-b31
-+43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10
-+a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30
-+d7f2b3949f9c9ff1115ea61c496d3cd4c62e2759 jdk7u7-b11
-+82c51e6a3bea0dd8feb1bd3033e847dbdc5d9f99 jdk7u7-b31
-+5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u7-b01
-+dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u7-b02
-+bae912f95f2aa1d22dbc0ff62816b71861965cd6 jdk7u9-b03
-+0000000000000000000000000000000000000000 jdk7u7-b01
-+5ca487420f9c2cf6d39acf1e842d13bf8ef0ca07 jdk7u9-b01
-+0000000000000000000000000000000000000000 jdk7u7-b02
-+dbfa9c57853c2dd9cd4e4a139d83b519573d8031 jdk7u9-b02
-+3159fbe20e2d9501007aae8ca3db58978d754561 jdk7u9-b04
-+d9c8fa0606fdfff242175ce904c525a6fc40d6e5 jdk7u9-b05
-+81f8b620894e275012a1b447f13319b7d2148b28 jdk7u9-b31
-+d247cdeb828f4463b55ea53c4b2d6346f7706c3c jdk7u9-b32
-+d934ce27cddbc9ba7236791f177872491204a41e jdk7u10-b10
-+5a5ee5b70d563d5817b6ec023d275e9b17256459 jdk7u10-b11
-+48b58c2d665c9a1d3598b981e46f87f9bcdd5b46 jdk7u10-b12
-+1b9618b61e29c09b92f83956c613acf36ccabb38 jdk7u10-b13
-+c50e1a044e4fcc1a94b79b42f3629beb07624010 jdk7u10-b14
-+137087461db28f935493940658f31be760098f00 jdk7u10-b15
-+c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u10-b16
-+494e838439db7f0f4e36f7dcfeba06d2bef78c8d jdk7u10-b17
-+dce9058d2151e6b5c84898c13cfd1521a627a296 jdk7u10-b18
-+b5fb925394331313dbe3859fdc408bfd37193476 jdk7u10-b30
-+337ce65c8c356766212812b78f49f5632995987d jdk7u10-b31
-+c2d5141baeda6c9b5bbc83c21eff9c3940fefae4 jdk7u11-b20
-+168aa0f1417b3651a955ae66068dc148b660f829 jdk7u11-b21
-+7c0710ed65b097d415f772ff4fb58c4822890aa3 jdk7u11-b32
-+61cee7a518a4ae05439490ec388c3ab1d1d899f2 jdk7u11-b33
-+c8a37a49fc90ae31b864544d6d4a9f6137d4995d jdk7u11-b03
-+0b418e2ccf9093718609144689d1a8b316ad951f jdk7u11-b04
-+e127e6c94b56f7348df67d9672c16a7dc9c5ec5e jdk7u11-b05
-+f6abff072aabfee866342d9f7f4aac7d13450ddf jdk7u11-b06
-+80a3d0bcd3d4c9e83b75416178bdd60a2d23ebbc jdk7u11-b07
-+e7c55def6796d3c426631b5717084ef122908847 jdk7u11-b08
-+2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u13-b09
-+3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10
-+527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30
-+3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20
-+0e52db2d9bb8bc789f6c66f2cfb7cd2d3b0b16c6 jdk7u15-b01
-+0324fca94d073b3aad77658224f17679f25c18b1 jdk7u15-b02
-+25a9d44cebf2a7ac6dd1748c94e00b242403acb1 jdk7u15-b30
-+5c1b2900a65b5ebe9d2a5c9b48903081c8196b04 jdk7u15-b31
-+e7adbfbcd837ad4e9f88db45612e5704b7a249fd jdk7u15-b33
-+f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03
-+2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32
-+0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01
-+8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02
-+933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30
-+790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31
-+941539a9f6441f053e8e7f31064944b2fc08879f jdk7u17-b32
-+527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u21-b01
-+bc264b362dc7b4f2bda34e1a5b87a4f0c2bd4d82 jdk7u21-b02
-+20603c659295a40c7f16259cb08c91475092efed jdk7u21-b03
-+d2b1fdd8ee0affe640c7493ab3ae04fcc1961446 jdk7u21-b04
-+2d6657f92359d1d46b355fd0c99b8aa5f34832e4 jdk7u21-b05
-+14522481739dc6981beb5cc55d543dcc62cda067 jdk7u21-b06
-+0df382e8c17bf817d55fc8759c7f5c9e9d0337f0 jdk7u21-b07
-+1aff32a21aba64c3767e9a72ebf1b8ba490e99ec jdk7u21-b08
-+a2e0099b4cf70be026a7a0ba7918fcd71d57fdce jdk7u21-b09
-+602ad1a5b09fb9136e8bf1b708e0524fbdb35324 jdk7u21-b10
-+fa322ca378324750ea049f2e92357e51eca27ae4 jdk7u21-b11
-+450e8dde919df278fe75ae95e0eb0a6464f5bc41 jdk7u21-b30
-+170520883597f90771aca8251a8d089e7566e4bf jdk7u21-b12
-+50bfbd21bf42f6ae4167226ac45cd79e0ab7758c jdk7u25-b03
-+a94c9aa356bbed13c1e2b4a9a380117ddff1668f jdk7u25-b04
-+29a789ae14dc09a50eb45d3445075642e77490a2 jdk7u25-b05
-+8a7c657b7536006633b5e961d93e2173712a64fa jdk7u25-b06
-+d45374e7c7eeb4e01d9f239e71e8a8aff453d55a jdk7u25-b07
-+b01002577912b89306e88a9973b6f3bc049a2a69 jdk7u25-b08
-+84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
-+aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
---- corba/.hgtags 2012-08-10 09:09:50.000000000 -0700
-+++ corba/.hgtags 2013-06-22 09:41:22.000000000 -0700
+@@ -300,6 +301,22 @@
+ 84285f4e0aa2f81b80bc6fbe713d768c0d9a7156 jdk7u25-b09
+ aae1e27d347b71f65f548c12b918ede98d869b7c jdk7u25-b10
+ 039f12124903cd0b7633a17a26f6ca281f7aaeae jdk7u25-b11
++210f464368dba0fc4f8d239654fa7432ad2ed31f jdk7u14-b16
++f07712232642fc30dcf7c433ff890e7247b5fd0b jdk7u14-b17
++9e2a9a2c5b240daa4e27ff75d030a77827174753 jdk7u14-b18
++d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
++d9d4dc020cb37142230f6a20d2a75a677c5cd26f jdk7u14-b19
++b4b7795ef8047e3d2b2ba48a70c08d9184073100 jdk7u14-b19
++f413e7a22c198559af5aca28309356e6d4edd78f jdk7u14-b20
++41686e19d8189a546434a52dd9679e9b6a0a68be jdk7u14-b21
++3e3177719b43f732239d6d51e96d26ee18440960 jdk7u14-b22
++8c6e2197930c79f6beafd83181714cc817b83229 jdk7u40-b23
++5169c92728b54a4b5e9a41071f8bf8701d0fe1fa jdk7u40-b24
++f89fd7e2800c1c35b6c339f54780d5579bb30991 jdk7u40-b25
++4ef57f592525d36487ea6eeb2be84d0e9170b26b jdk7u40-b26
++75167199239375d05b68668023c885c2776fd548 jdk7u40-b27
++ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
++dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+ 2d02518960053d2b1dcb9aabacd709788e92c549 jdk7u25-b12
+ 37c4268341d79b16165bdaf7e1fad489d692bc83 jdk7u25-b13
+ 9de1fc3635def64c19c51f272f09b51d8cf0ca98 jdk7u25-b14
+@@ -327,7 +344,7 @@
+ ac751f3867ecffca814b25daf5e19d82d83fc755 jdk7u40-b28
+ dbe42a627813892d1bb59a4240c24f60ef22930a jdk7u40-b29
+ 1c141e6fde911c4974c87e340eb698754607f422 jdk7u40-b30
+-58a2a470aa3bccd3eb3624e68bca9397c8cc26a2 jdk7u40-b31
++e51f24701c608e57ba7ae69ba28bbc2daab02c4c jdk7u45-b01
+ da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32
+ 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33
+ a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34
+@@ -341,3 +358,37 @@
+ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42
+ 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43
+ dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60
++6359fa34199c9619dfec0f41d2eb22a4083ce610 jdk7u40-b61
++a2605cf03226ce2fef7a899ce41521c654300975 jdk7u40-b62
++07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02
++23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03
++1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04
++22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
++61343f60f25a1d0deddc1468b2eb948df5275641 jdk7u45-b06
++24088aaf3f6834e46b486b706fbc6ce1f18814e5 jdk7u45-b07
++036425509e31070700a3956aaca7c33d583b7a5e jdk7u45-b08
++b6af2c522a633de1c7b66204fac7104b410ce23c jdk7u45-b09
++3fedb8c609a0f43bc8084edbecb0435e19dcb9a2 jdk7u45-b10
++142403d9f1167b8559b49627c7199c84623307da jdk7u45-b11
++a14018a5fa18092dcca5084656abb797bdb7b5ff jdk7u45-b12
++4d38e9adeb81df9c24550070df1f358aa9c17477 jdk7u45-b13
++bab0456ba0520f73ee20814ddf7ea0d596e49abd jdk7u45-b14
++b4b2584649027b622c188db7a6c3f9cff0e20130 jdk7u45-b15
++f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u45-b16
++6fd67e0287a9893ea1f0090fe127f18a7e235148 jdk7u45-b17
++f0cdb08a4624a623bdd178b04c4bf5a2fa4dc39a jdk7u45-b18
++82f1f76c44124c31cb1151833fc15c13547ab280 jdk7u45-b30
++f4373de4b75ba8d7f7a5d9c1f77e7884d9064b7e jdk7u45-b31
++f2479abad143d2d9f33b6c872890ca0c5dd52530 jdk7u51-b00
++c5822e1d1baa9625ee4e54b8e83a9bf529c883fc jdk7u51-b01
++f750621fb31b8f6462b803b47bbf84f05cd5174a jdk7u51-b02
++dafd6c301c979ece6493dfb52e09e46bc81b7285 jdk7u51-b03
++8bc2f477bba4ccecaf46a52877e429342ab9c5bc jdk7u51-b04
++1604b330bf9629da5cac02af8582717dd431032e jdk7u51-b05
++15c531ebb19c21a5b565ce887c790d3855b461ef jdk7u51-b06
++75f0610e93bf6f51b3674fbbbe16f648ceb34d29 jdk7u51-b07
++467fc49c32dd8e3dd940ad0e5934a65fc7fb60ec jdk7u51-b08
++73ebe4e4f20e1d5db72c5cd673c65ffa09259982 jdk7u51-b09
++9868efbea4290f4359a6a54d722f2cb79ef634a9 jdk7u51-b10
++573c4cfca7dda548463bb84330bddfd07fe1183f jdk7u51-b11
++df53ec7eb789e7dec375a685dce1fa5cf63618b4 jdk7u51-b12
+--- Makefile 2013-09-06 11:20:33.000000000 -0700
++++ Makefile 2013-12-01 11:13:37.000000000 -0800
+@@ -264,7 +264,7 @@
+ DEBUG_NAME=$(DEBUG_NAME) \
+ GENERATE_DOCS=false \
+ $(if $(findstring true,$(BUILD_INSTALL)),BUILD_INSTALL_BUNDLES=true,) \
+- CREATE_DEBUGINFO_BUNDLES=false \
++ CREATE_DEBUGINFO_BUNDLES=true \
+ $(BOOT_CYCLE_DEBUG_SETTINGS) \
+ generic_build_repo_series
+
+--- corba/.hgtags 2013-09-06 11:20:46.000000000 -0700
++++ corba/.hgtags 2014-01-18 12:16:06.000000000 -0800
@@ -123,6 +123,7 @@
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
@@ -100,3422 +99,44045 @@
9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
-@@ -197,5 +198,81 @@
- 353c15c4bc371f2f8258344c988d1403477cc140 jdk7u6-b21
- 793b80c0316fcafa18668bced26acb41af3be07d jdk7u6-b22
- 2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23
--353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01
--d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02
-+02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24
-+8b20875b3faa01ef56331045de88747df278eaeb jdk7u6-b30
-+d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u6-b31
-+d7fe6c13adf9e06d98c061449d171bc06c2ba0a3 jdk7u7-b10
-+496baf62d0550c704505b0ff6f390279f6a569e0 jdk7u7-b30
-+e57e4274a3575f278115cc8ef03c5bdf3c43a7ed jdk7u7-b11
-+06cbc4af754ea8f2e3b7d0b1701d1a69ce9d5075 jdk7u7-b31
-+8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u7-b01
-+ec602836c4e173927911673d253bb8baa1e3d170 jdk7u7-b02
-+a163e56c6679d10dc64ec48f35e67c3a5942afba jdk7u9-b03
-+0000000000000000000000000000000000000000 jdk7u7-b01
-+8737f43e092ea52dd85dcf164736eea3b9b364e6 jdk7u9-b01
-+0000000000000000000000000000000000000000 jdk7u7-b02
-+ec602836c4e173927911673d253bb8baa1e3d170 jdk7u9-b02
-+268470f3f0d0d7e9b04c579c551571097f0b0305 jdk7u9-b04
-+a5dced409c4b7f940db80846f6efabac74523b0e jdk7u9-b05
-+b426254b45bcd7cdb38003497fdd4168e366d3cb jdk7u9-b31
-+0fa70374aa257929e2541e57c55c4cdebec91fd4 jdk7u9-b32
-+ba68d4ad02c465a36344a34eba34491466ec17d4 jdk7u10-b10
-+a738921b001a92381bf355a2bb1ecd742ecee352 jdk7u10-b11
-+e52708ecb2c32b366c251e4083fbb37e22a425c3 jdk7u10-b12
-+5cd2ef642635a7d0a79a7c28343b2ddfd0e6aa4a jdk7u10-b13
-+2d53a2c7e4b989ceba356abfc8dc2129269a134f jdk7u10-b14
-+c488cd628db35eb09d8ef9e10ffd00c9a93d0778 jdk7u10-b15
-+64f09d7549d304fbfd3c29b4f148bf44e8e3e979 jdk7u10-b16
-+57c3355153d1624fd98618097c1a82ab3ffc66f8 jdk7u10-b17
-+f2a347637a55fa4de9542a8dcab72ad6fac44d2b jdk7u10-b18
-+22cf8bc2ec47498fe548b308a81be0486dd7e3d0 jdk7u10-b30
-+2723612f5983e7d65490d7d4a3d8577026448736 jdk7u10-b31
-+e7952daece16b27d69cb78f6912407c3bbaf8e83 jdk7u11-b20
-+dff0f0272891b1d53497d9525567959b73476ff9 jdk7u11-b21
-+24f8cb8a0a615686f8baba4d746514bae92f064d jdk7u11-b32
-+4bfef14df261d69dc32e37d189e12e3fa572a83c jdk7u11-b33
-+96a3c68e5741dc9ab5cb0da426511eb15fd29ede jdk7u11-b03
-+1413b173730f4796fca42c89eeb804a5935b0264 jdk7u11-b04
-+5c49a17bc15f4fd4722746788f5130df132cd038 jdk7u11-b05
-+30057c20fbb3caa61857656d05421e56731184f2 jdk7u11-b06
-+9d9440d1fa2dd872c2a2b564fc5fa4d3555afab6 jdk7u11-b07
-+983fac5b27376839142ac5a8770461e4e48c2dc8 jdk7u11-b08
-+b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u13-b09
-+b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b10
-+f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u13-b30
-+b9ab9b203a41469a274419d26be2c04558b57ce8 jdk7u13-b20
-+622e370c2d1e8c5f48d8f520f486dc6fcc1239c5 jdk7u15-b01
-+30188388048333e213a839363329ac2cb0cf0e0d jdk7u15-b02
-+7f0e7ce088ff554f64e2c102ae3718ae4d580c34 jdk7u15-b30
-+3714b558333e1089e2649ead8586873abd9c0ed1 jdk7u15-b31
-+f0c038610b6da1a0d4214b730aa6cb17b64d0a3b jdk7u15-b33
-+e5b996dabec6ac6aa12705ce678642605ea9d476 jdk7u15-b03
-+b192d148731916e4b1b47b7a3e6b0a1d7ddf3f14 jdk7u15-b32
-+94e8b9b0e0ef1685e2f2fcc886e08a42a85c8e03 jdk7u17-b01
-+e82d31e1f1189ae6f02d6855f0cd78074599b2e1 jdk7u17-b02
-+d4366e557c4c5af62a94fc9885aed87c99abc848 jdk7u17-b30
-+a6f066dd2cd526da73070d1e46c9b1e1ab1a6756 jdk7u17-b31
-+6401c6b99d2d43ed4f0e2d38dce496069f6e91f8 jdk7u17-b32
-+f5ef46204dba19679edd7492b221110fd1a0bd33 jdk7u21-b01
-+17ecd70a2247ed86a095aae9f1a201fa7feea861 jdk7u21-b02
-+bf0877613aeba816d5f18ea6316d535819f628e9 jdk7u21-b03
-+3e39240d7314e82b3ccff3b2a64413be9c0b6665 jdk7u21-b04
-+f5a291dc9d219f68a2d4bcc72c65c014e9ec3b8b jdk7u21-b05
-+94f2ebfccc5e057169284bb2c858296b235868ea jdk7u21-b06
-+23a57aceeb69e688f8ce8b8361fad3a49cf4ac5f jdk7u21-b07
-+ebedf04bfffe289e8bf9661b38f73ca6c0dad17c jdk7u21-b08
-+b8f92ad1f0cc86d8571a0e23192e667f0ef8e421 jdk7u21-b09
-+b2adfd931a2504948d4fee780e4175122be10484 jdk7u21-b10
-+61e2e2d9cfcea20132b50d8fb7ead66a8a373db7 jdk7u21-b11
-+3c774492beaaff241c654add2c4e683b9ff002f2 jdk7u21-b30
-+fa2a377ce52dfa88fca858d735d78b53f2b5b754 jdk7u21-b12
-+3d0f2d5b1866860f7089b51cca8ca0ca41c04d9c jdk7u25-b01
-+cdbafc5080eeb8ea3fec9fe7d071e0bf96635581 jdk7u25-b02
-+2057de7ee6b17ab3335ec6cd5730f88f4cfe9502 jdk7u25-b03
-+b180f1282ad221bde0d4d865c879c0fa7f8ef4c8 jdk7u25-b04
-+d97e6c162735798fe0c9f1dd582aa1114b6c5447 jdk7u25-b05
-+da9301dac56c26846212db33bb20001652b6ce60 jdk7u25-b06
-+aa2dc8d3bb2cdd726ec97bc2bf130eec46467f28 jdk7u25-b07
-+550d43da7fe2f85bbce88cc94066c589480b1221 jdk7u25-b08
-+161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
-+c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
---- corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2012-08-10 09:09:53.000000000 -0700
-+++ corba/make/com/sun/corba/minclude/com_sun_corba_se_impl_orbutil.jmk 2013-06-22 09:39:21.000000000 -0700
-@@ -1,5 +1,5 @@
+@@ -302,6 +303,22 @@
+ 161ec4dd450d59e1b8ad136db231925c97ff6205 jdk7u25-b09
+ c9da98e82bb006dccd94a50871d6cdb66fa2d7e7 jdk7u25-b10
+ 109386df5b8e259d0af802217769a3c448404e49 jdk7u25-b11
++38282b734daefcbb8155b7d7ef9664130330ed14 jdk7u14-b16
++8b1d77697ca4d2a9c29d67fd2ff03aded9b06012 jdk7u14-b17
++862b43d26e03bbceb3465f93354860e0d17eb324 jdk7u14-b18
++bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
++bfbaab73969d4d978d0280d6ad51bac8c47dbaf8 jdk7u14-b19
++a921b45a1f9086a7d598a76f920639050386f996 jdk7u14-b19
++54320e5d9da60df24f0e2c57c011809911dc06e1 jdk7u14-b20
++fb590ca4de9aaf1f6bca945be040dffc55b5e8d2 jdk7u14-b21
++e5d89aa2c1a11dba841a646858dda9ea18dc8f57 jdk7u14-b22
++d85df1552f877a1cc51f43bc07a42a0c48f18e0b jdk7u40-b23
++d3ab3b19caa02ee85359cfe07b6e0b74eb7b3d74 jdk7u40-b24
++abfc54516d0b7f9aed34ef175f6bbb93fda4cbb3 jdk7u40-b25
++be9099c54a35c00d0dfe6beeed8ea5d4ab3cd3fe jdk7u40-b26
++f745eeabb0eaabe8c0835c175b31f1e1c0f00bd4 jdk7u40-b27
++c8b9201f88f4ce417df7a40efcb7fef656d94512 jdk7u40-b28
++1ad0a5a3f7b1e9d95670d733d7e70714050ba6bf jdk7u40-b29
+ ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12
+ eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13
+ 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14
+@@ -343,3 +360,38 @@
+ b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42
+ e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43
+ 08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60
++504acad3372298a79c231696d805f00f3beb2362 jdk7u40-b61
++c9c225fb19c3aa6e1242c051833ecc69d00b7aa1 jdk7u40-b62
++4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01
++1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02
++3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03
++4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04
++faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05
++435dd0e1ab9ec9cbc83dc5ed260886f6becbef25 jdk7u45-b06
++2e19615f6045c3f39e39c56c485f7bc1df97e2ce jdk7u45-b07
++771c5c869d16d2da5668e412f505ad75f8f610c1 jdk7u45-b08
++a89d69bef3614f618843f5e9a495b12d13597851 jdk7u45-b09
++fd8a2041b75c4f712f2b08d627388d44a0cf2ee7 jdk7u45-b10
++55e0d3d9514343f380336b68aa8691a89b2e710b jdk7u45-b11
++336566c2905a49fc9a6f90f5ecd30517cfcaefff jdk7u45-b12
++6cadc3dd82a423f6c24460bb1997c0f39159dd93 jdk7u45-b13
++43e22471d0c29451f282b162864c2d3e494d5871 jdk7u45-b14
++3d7a52de59f03589d7a9334a6895063ff3331bfc jdk7u45-b15
++b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u45-b16
++8b8793f06c56e343962b473bc0fb79f23b8be734 jdk7u45-b17
++80f65a8f58500ef5d93ddf4426d9c1909b79fadf jdk7u45-b18
++a15e4a54504471f1e34a494ed66235870722a0f5 jdk7u45-b30
++b7fb35bbe70d88eced3725b6e9070ad0b5b621ad jdk7u45-b31
++b1f069eb48edfa6fb7428dc045a53e287215ef4a jdk7u51-b00
++8d884cf2e8cce92d532950de2c7283d9804f9e58 jdk7u51-b01
++327035fbb0433927c1b1af2bc0bcb84e7827f1b9 jdk7u51-b02
++3c186a6d2b86ec4c6cfb093969d5f4e4a6ef6a98 jdk7u51-b03
++6969598640b2a4731634669eb1402a6af5772b44 jdk7u51-b04
++b18c17608d944028724858e1f768fb0a59dc8220 jdk7u51-b05
++863d69d3dee00e7958ed1014e7600cc08f2655e7 jdk7u51-b06
++3f6dfcad33acb0251c60facb6b5e8dbff41a4114 jdk7u51-b07
++00c7d4007a2f22deb05753bbd2d36f0ce43ac786 jdk7u51-b08
++bb45667f58f57f96c00551db26ab281bd101e892 jdk7u51-b09
++eecfc296009b81934a329e7ce42a53484093f611 jdk7u51-b10
++a26d0e8ab1027e70ae1ded8ede0086a0a4a10256 jdk7u51-b11
++55a509ccc0e4ed49e311c7ecf2ed29a908bc1d6b jdk7u51-b12
+--- corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700
++++ corba/make/Makefile 2014-01-18 12:16:05.000000000 -0800
+@@ -160,7 +160,7 @@
#
--# Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ # CORBA
#
- # This code is free software; you can redistribute it and/or modify it
-@@ -29,10 +29,6 @@
- com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java \
- com/sun/corba/se/impl/orbutil/GetPropertyAction.java \
- com/sun/corba/se/impl/orbutil/HexOutputStream.java \
-- com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3.java \
-- com/sun/corba/se/impl/orbutil/IIOPInputStream_1_3_1.java \
-- com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3.java \
-- com/sun/corba/se/impl/orbutil/IIOPOutputStream_1_3_1.java \
- com/sun/corba/se/impl/orbutil/LegacyHookGetFields.java \
- com/sun/corba/se/impl/orbutil/LegacyHookPutFields.java \
- com/sun/corba/se/impl/orbutil/LogKeywords.java \
-@@ -43,21 +39,12 @@
- com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java \
- com/sun/corba/se/impl/orbutil/ORBConstants.java \
- com/sun/corba/se/impl/orbutil/ORBUtility.java \
-- com/sun/corba/se/impl/orbutil/ORBClassLoader.java \
- com/sun/corba/se/impl/orbutil/RepIdDelegator.java \
-- com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java \
-- com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java \
-- com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3.java \
-- com/sun/corba/se/impl/orbutil/RepositoryId_1_3.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdFactory.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java \
- com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java \
-- com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java \
-- com/sun/corba/se/impl/orbutil/RepositoryId_1_3_1.java \
- com/sun/corba/se/impl/orbutil/StackImpl.java \
-- com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3_1.java \
-- com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java \
- com/sun/corba/se/impl/orbutil/closure/Future.java \
- com/sun/corba/se/impl/orbutil/closure/Constant.java \
- com/sun/corba/se/impl/orbutil/concurrent/Sync.java \
---- corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2012-08-10 09:10:11.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java 2013-03-09 18:08:34.000000000 -0800
+-SUBDIRS = tools javax org sun com
++SUBDIRS = tools sun/rmi javax org sun com
+
+ build:
+ $(SUBDIRS-loop)
+--- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-09-06 11:20:47.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-01-18 12:16:06.000000000 -0800
+@@ -82,11 +82,18 @@
+ super((ORB)orb);
+ }
+
+- public org.omg.CORBA.portable.InputStream create_input_stream()
+- {
+- return new AnyInputStream(
+- (com.sun.corba.se.impl.encoding.EncapsInputStream)
+- super.create_input_stream());
++ public org.omg.CORBA.portable.InputStream create_input_stream() {
++ final org.omg.CORBA.portable.InputStream is = super
++ .create_input_stream();
++ AnyInputStream aIS = AccessController
++ .doPrivileged(new PrivilegedAction<AnyInputStream>() {
++ @Override
++ public AnyInputStream run() {
++ return new AnyInputStream(
++ (com.sun.corba.se.impl.encoding.EncapsInputStream) is);
++ }
++ });
++ return aIS;
+ }
+ }
+
+--- corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-01-18 12:16:06.000000000 -0800
@@ -1,5 +1,5 @@
/*
-- * Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
-@@ -322,9 +322,9 @@
- com.sun.corba.se.spi.activation._ServerImplBase
- {
- private ORB orb;
-- private Method installMethod ;
-- private Method uninstallMethod ;
-- private Method shutdownMethod ;
-+ private transient Method installMethod ;
-+ private transient Method uninstallMethod ;
-+ private transient Method shutdownMethod ;
- private Object methodArgs[] ;
-
- ServerCallback(ORB orb, Method installMethod, Method uninstallMethod,
---- corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java 2012-08-10 09:10:12.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/activation/ServerManagerImpl.java 2013-06-22 09:39:21.000000000 -0700
+@@ -36,11 +36,10 @@
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
+
+ import com.sun.corba.se.spi.orb.ORB;
+-
+ import com.sun.corba.se.spi.logging.CORBALogDomains;
+-
+ import com.sun.corba.se.impl.logging.ORBUtilSystemException;
+
++import sun.corba.EncapsInputStreamFactory;
+ /**
+ * Encapsulations are supposed to explicitly define their
+ * code sets and GIOP version. The original resolution to issue 2784
+@@ -148,7 +147,7 @@
+ }
+
+ public CDRInputStream dup() {
+- return new EncapsInputStream(this);
++ return EncapsInputStreamFactory.newEncapsInputStream(this);
+ }
+
+ protected CodeSetConversion.BTCConverter createCharBTCConverter() {
+--- corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-01-18 12:16:06.000000000 -0800
@@ -1,5 +1,5 @@
/*
-- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2001, 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
-@@ -81,7 +81,6 @@
-
- import com.sun.corba.se.impl.oa.poa.BadServerIdHandler;
+@@ -39,6 +39,8 @@
+ import com.sun.corba.se.impl.protocol.giopmsgheaders.Message;
import com.sun.corba.se.impl.orbutil.ORBConstants;
--import com.sun.corba.se.impl.orbutil.ORBClassLoader;
- import com.sun.corba.se.impl.orbutil.ORBUtility;
- import com.sun.corba.se.impl.util.Utility;
---- corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2012-08-10 09:10:12.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-06-22 09:39:21.000000000 -0700
++import sun.corba.EncapsInputStreamFactory;
++
+ /**
+ * Encapsulations are supposed to explicitly define their
+ * code sets and GIOP version. The original resolution to issue 2784
+@@ -107,11 +109,11 @@
+ public org.omg.CORBA.portable.InputStream create_input_stream() {
+ freeInternalCaches();
+
+- return new EncapsInputStream(orb(),
+- getByteBuffer(),
+- getSize(),
+- isLittleEndian(),
+- getGIOPVersion());
++ return EncapsInputStreamFactory.newEncapsInputStream(orb(),
++ getByteBuffer(),
++ getSize(),
++ isLittleEndian(),
++ getGIOPVersion());
+ }
+
+ protected CodeSetConversion.CTBConverter createCharCTBConverter() {
+--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-01-18 12:16:06.000000000 -0800
@@ -1,5 +1,5 @@
/*
-- * Copyright (c) 1997, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2002, 2003, 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
-@@ -33,6 +33,8 @@
+@@ -64,6 +64,8 @@
+ import com.sun.corba.se.impl.encoding.CDROutputStream;
+ import com.sun.corba.se.impl.encoding.MarshalInputStream;
- import java.io.Serializable;
- import java.math.BigDecimal;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
- import java.util.List ;
- import java.util.ArrayList ;
++import sun.corba.EncapsInputStreamFactory;
++
+ public class TypeCodeInputStream extends EncapsInputStream implements TypeCodeReader
+ {
+ private Map typeMap = null;
+@@ -157,11 +159,13 @@
+
+ // create an encapsulation using the marshal buffer
+ if (is instanceof CDRInputStream) {
+- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length,
+- ((CDRInputStream)is).isLittleEndian(),
+- ((CDRInputStream)is).getGIOPVersion());
++ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
++ encapBuffer, encapBuffer.length,
++ ((CDRInputStream) is).isLittleEndian(),
++ ((CDRInputStream) is).getGIOPVersion());
+ } else {
+- encap = new TypeCodeInputStream((ORB)_orb, encapBuffer, encapBuffer.length);
++ encap = EncapsInputStreamFactory.newTypeCodeInputStream((ORB) _orb,
++ encapBuffer, encapBuffer.length);
+ }
+ encap.setEnclosingInputStream(is);
+ encap.makeEncapsulation();
+--- corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-01-18 12:16:06.000000000 -0800
+@@ -61,6 +61,8 @@
+ import java.math.BigInteger;
+ import java.nio.ByteBuffer;
-@@ -504,7 +506,13 @@
- public org.omg.CORBA.portable.OutputStream create_output_stream()
++import sun.corba.EncapsInputStreamFactory;
++
+ public final class TypeCodeOutputStream extends EncapsOutputStream
+ {
+ private OutputStream enclosure = null;
+@@ -77,9 +79,9 @@
+
+ public org.omg.CORBA.portable.InputStream create_input_stream()
{
- //debug.log ("create_output_stream");
-- return new AnyOutputStream(orb);
-+ final ORB finalorb = this.orb;
-+ return AccessController.doPrivileged(new PrivilegedAction<AnyOutputStream>() {
-+ @Override
-+ public AnyOutputStream run() {
-+ return new AnyOutputStream(finalorb);
-+ }
-+ });
- }
+- //return new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian());
+- TypeCodeInputStream tcis
+- = new TypeCodeInputStream((ORB)orb(), getByteBuffer(), getIndex(), isLittleEndian(), getGIOPVersion());
++ TypeCodeInputStream tcis = EncapsInputStreamFactory
++ .newTypeCodeInputStream((ORB) orb(), getByteBuffer(),
++ getIndex(), isLittleEndian(), getGIOPVersion());
+ //if (TypeCodeImpl.debug) {
+ //System.out.println("Created TypeCodeInputStream " + tcis + " with no parent");
+ //tcis.printBuffer();
+--- corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-01-18 12:16:06.000000000 -0800
+@@ -33,6 +33,8 @@
+ import com.sun.corba.se.spi.ior.iiop.GIOPVersion;
+ import com.sun.corba.se.spi.logging.CORBALogDomains;
- /**
-@@ -1218,7 +1226,7 @@
- // See bug 4391648 for more info about the tcORB in this
- // case.
- RepositoryIdStrings repStrs
-- = RepositoryIdFactory.getRepIdStringsFactory(tcORB);
-+ = RepositoryIdFactory.getRepIdStringsFactory();
-
-
- // Assertion: c instanceof Serializable?
-@@ -1251,7 +1259,7 @@
- // Anything else
- // We know that this is a TypeCodeImpl since it is our ORB
- classTC = (TypeCodeImpl)ValueUtility.createTypeCodeForClass(
-- tcORB, c, ORBUtility.createValueHandler(tcORB));
-+ tcORB, c, ORBUtility.createValueHandler());
- // Intruct classTC to store its buffer
- classTC.setCaching(true);
- // Update the cache
---- corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java 2012-08-10 09:10:13.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java 2013-06-22 09:39:21.000000000 -0700
++import sun.corba.EncapsInputStreamFactory;
++
+ import com.sun.corba.se.impl.corba.AnyImpl;
+ import com.sun.corba.se.impl.encoding.EncapsInputStream;
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream;
+@@ -193,8 +195,9 @@
+ // it is turned into a FormatMismatch exception.
+
+ try {
+- EncapsInputStream cdrIn = new EncapsInputStream( orb, data,
+- data.length, giopVersion );
++ EncapsInputStream cdrIn = EncapsInputStreamFactory.newEncapsInputStream( orb, data,
++ data.length, giopVersion );
++
+
+ cdrIn.consumeEndian();
+
+--- corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-01-18 12:16:06.000000000 -0800
@@ -1,5 +1,5 @@
/*
-- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1998, 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
-@@ -600,7 +600,8 @@
+@@ -370,7 +370,7 @@
+ * @exception IOException Any of the usual Input/Output related exceptions.
+ * @since JDK1.1
+ */
+- public final Object readObjectDelegate() throws IOException
++ public final synchronized Object readObjectDelegate() throws IOException
+ {
+ try {
+
+@@ -389,7 +389,7 @@
+ }
+ }
+
+- final Object simpleReadObject(Class clz,
++ final synchronized Object simpleReadObject(Class clz,
+ String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender,
+ int offset)
+@@ -461,7 +461,7 @@
+ return obj;
+ }
+
+- public final void simpleSkipObject(String repositoryID,
++ public final synchronized void simpleSkipObject(String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender)
+ /* throws OptionalDataException, ClassNotFoundException, IOException */
+ {
+@@ -559,7 +559,7 @@
+ * objects.
+ * @since JDK1.1
+ */
+- public final void defaultReadObjectDelegate()
++ final synchronized void defaultReadObjectDelegate()
+ /* throws IOException, ClassNotFoundException, NotActiveException */
+ {
+ try {
+@@ -988,7 +988,7 @@
+ }
+ }
+
+- private Object inputObject(Class clz,
++ private synchronized Object inputObject(Class clz,
+ String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender,
+ int offset)
+@@ -1317,7 +1317,7 @@
+ * a form of custom marshaling.
+ *
+ */
+- private Object inputObjectUsingFVD(Class clz,
++ private synchronized Object inputObjectUsingFVD(Class clz,
+ String repositoryID,
+ com.sun.org.omg.SendingContext.CodeBase sender,
+ int offset)
+--- corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-01-18 12:16:06.000000000 -0800
+@@ -201,7 +201,7 @@
+ readObjectState.endDefaultReadObject(this);
}
- public static CDROutputStream newOutputStream(ORB orb) {
-- TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb);
-+ TypeCodeOutputStream tcos =
-+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb);
- //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos +
- // " with no parent");
- return tcos;
---- corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2012-08-10 09:10:15.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream_1_0.java 2013-03-09 18:08:34.000000000 -0800
+- public abstract void defaultReadObjectDelegate();
++ abstract void defaultReadObjectDelegate();
+
+ abstract void readFields(java.util.Map fieldToValueMap)
+ throws java.io.InvalidClassException, java.io.StreamCorruptedException,
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-01-18 12:16:06.000000000 -0800
@@ -1,5 +1,5 @@
/*
-- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
-@@ -269,8 +269,8 @@
+@@ -47,6 +47,8 @@
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
+ import com.sun.corba.se.impl.encoding.EncapsInputStream ;
- private final void createRepositoryIdHandlers()
++import sun.corba.EncapsInputStreamFactory;
++
+ /**
+ * This static utility class contains various utility methods for reading and
+ * writing CDR encapsulations.
+@@ -108,8 +110,8 @@
+ static public InputStream getEncapsulationStream( InputStream is )
{
-- repIdUtil = RepositoryIdFactory.getRepIdUtility(orb);
-- repIdStrs = RepositoryIdFactory.getRepIdStringsFactory(orb);
-+ repIdUtil = RepositoryIdFactory.getRepIdUtility();
-+ repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
- }
-
- public GIOPVersion getGIOPVersion() {
-@@ -564,10 +564,7 @@
-
- checkForNegativeLength(len);
-
-- if (orb != null && ORBUtility.isLegacyORB((ORB)orb))
-- return legacyReadString(len);
-- else
-- return internalReadString(len);
-+ return internalReadString(len);
- }
-
- private final String internalReadString(int len) {
-@@ -588,54 +585,6 @@
- return new String(result, 0, getCharConverter().getNumChars());
- }
-
-- private final String legacyReadString(int len) {
--
-- //
-- // Workaround for ORBs which send string lengths of
-- // zero to mean empty string.
-- //
-- //
-- // IMPORTANT: Do not replace 'new String("")' with "", it may result
-- // in a Serialization bug (See serialization.zerolengthstring) and
-- // bug id: 4728756 for details
-- if (len == 0)
-- return new String("");
--
-- len--;
-- char[] c = new char[len];
--
-- int n = 0;
-- while (n < len) {
-- int avail;
-- int bytes;
-- int wanted;
--
-- avail = bbwi.buflen - bbwi.position();
-- if (avail <= 0) {
-- grow(1, 1);
-- avail = bbwi.buflen - bbwi.position();
-- }
-- wanted = len - n;
-- bytes = (wanted < avail) ? wanted : avail;
-- // Microbenchmarks are showing a loop of ByteBuffer.get(int) being
-- // faster than ByteBuffer.get(byte[], int, int).
-- for (int i=0; i<bytes; i++) {
-- c[n+i] = (char) (bbwi.byteBuffer.get(bbwi.position()+i) & 0xFF);
-- }
-- bbwi.position(bbwi.position() + bytes);
-- n += bytes;
-- }
--
-- //
-- // Skip past terminating null byte
-- //
-- if (bbwi.position() + 1 > bbwi.buflen)
-- alignAndCheck(1, 1);
-- bbwi.position(bbwi.position() + 1);
--
-- return new String(c);
-- }
--
- public final String read_string() {
- return readStringOrIndirection(false);
+ byte[] data = readOctets( is ) ;
+- EncapsInputStream result = new EncapsInputStream( is.orb(), data,
+- data.length ) ;
++ EncapsInputStream result = EncapsInputStreamFactory.newEncapsInputStream( is.orb(), data,
++ data.length ) ;
+ result.consumeEndian() ;
+ return result ;
}
-@@ -1045,7 +994,7 @@
-
- try {
- if (valueHandler == null)
-- valueHandler = ORBUtility.createValueHandler(orb);
-+ valueHandler = ORBUtility.createValueHandler();
-
- value = valueHandler.readValue(parent,
- indirection,
---- corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2012-08-10 09:10:15.000000000 -0700
-+++ corba/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_0.java 2013-03-09 18:08:34.000000000 -0800
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-01-18 12:16:06.000000000 -0800
@@ -1,5 +1,5 @@
/*
-- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 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
-@@ -189,18 +189,8 @@
+@@ -49,6 +49,8 @@
+ import com.sun.corba.se.impl.logging.IORSystemException ;
+
+ import com.sun.corba.se.impl.encoding.EncapsInputStream ;
++import sun.corba.EncapsInputStreamFactory;
++
- private final void createRepositoryIdHandlers()
+ /** Based on the magic and scid, return the appropriate
+ * ObjectKeyTemplate. Expects to be called with a valid
+@@ -217,7 +219,7 @@
+ public ObjectKey create( byte[] key )
{
-- if (orb != null) {
-- // Get the appropriate versions based on the ORB version. The
-- // ORB versioning info is only in the core ORB.
-- repIdUtil
-- = RepositoryIdFactory.getRepIdUtility(orb);
-- repIdStrs
-- = RepositoryIdFactory.getRepIdStringsFactory(orb);
-- } else {
-- // Get the latest versions
-- repIdUtil = RepositoryIdFactory.getRepIdUtility();
-- repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
-- }
-+ repIdUtil = RepositoryIdFactory.getRepIdUtility();
-+ repIdStrs = RepositoryIdFactory.getRepIdStringsFactory();
- }
+ OctetSeqHolder osh = new OctetSeqHolder() ;
+- EncapsInputStream is = new EncapsInputStream( orb, key, key.length ) ;
++ EncapsInputStream is = EncapsInputStreamFactory.newEncapsInputStream( orb, key, key.length );
+
+ ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ;
+ if (oktemp == null)
+--- corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2013-09-06 11:20:48.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-01-18 12:16:06.000000000 -0800
+@@ -70,6 +70,8 @@
+ import com.sun.corba.se.impl.encoding.EncapsInputStream ;
+ import com.sun.corba.se.impl.encoding.EncapsOutputStream ;
- public BufferManagerWrite getBufferManager()
-@@ -705,7 +695,7 @@
- private void writeArray(Serializable array, Class clazz) {
++import sun.corba.EncapsInputStreamFactory;
++
+ import com.sun.corba.se.impl.util.JDKBridge;
- if (valueHandler == null)
-- valueHandler = ORBUtility.createValueHandler(orb); //d11638
-+ valueHandler = ORBUtility.createValueHandler(); //d11638
+ import com.sun.corba.se.impl.logging.IORSystemException;
+@@ -170,8 +172,8 @@
+ throw wrapper.invalidTaggedProfile() ;
+ }
- // Write value_tag
- int indirection = writeValueTag(mustChunk, true,
-@@ -768,7 +758,7 @@
+- EncapsInputStream istr = new EncapsInputStream((ORB)orb, profile.profile_data,
+- profile.profile_data.length);
++ EncapsInputStream istr = EncapsInputStreamFactory.newEncapsInputStream((ORB)orb, profile.profile_data,
++ profile.profile_data.length);
+ istr.consumeEndian();
+ init( istr ) ;
+ }
+--- corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-09-06 11:20:49.000000000 -0700
++++ corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-12-01 11:13:38.000000000 -0800
+@@ -905,28 +905,4 @@
- private void writeRMIIIOPValueType(Serializable object, Class clazz) {
- if (valueHandler == null)
-- valueHandler = ORBUtility.createValueHandler(orb); //d11638
-+ valueHandler = ORBUtility.createValueHandler(); //d11638
+ return contents.toString();
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list