73474 Commits

Author SHA1 Message Date
Igor Ignatyev
4480b4d8b4 Merge 2014-12-24 19:31:28 +03:00
Yumin Qi
13548bcc63 Merge 2014-12-23 19:04:23 -08:00
Stuart Marks
457488c158 8067316: TEST_BUG: update RMI test library with better test.timeout.factor handling
Reviewed-by: lancea
2014-12-23 16:58:06 -08:00
Vladimir Kozlov
0936c21af6 Merge 2014-12-23 16:42:48 -08:00
Lana Steuck
253948253b Merge 2014-12-23 13:58:34 -08:00
Lana Steuck
7f05a39aac Merge 2014-12-23 13:58:01 -08:00
Lana Steuck
c3df76a96c Merge 2014-12-23 13:57:53 -08:00
Lana Steuck
469570c4be Merge 2014-12-23 13:57:28 -08:00
Lana Steuck
f64e617cac Merge 2014-12-23 13:57:26 -08:00
Lana Steuck
7a405e93eb Merge 2014-12-23 13:56:51 -08:00
Phil Race
6ada61f007 Merge 2014-12-23 13:34:20 -08:00
Brian Burkhalter
89ee032790 8067964: Native2ascii doesn't close one of the streams it opens
Change sun.tools.native2ascii.Main.convert() to use try-with-resources; also clean up code formatting.

Reviewed-by: chegar
2014-12-23 12:40:06 -08:00
Alejandro Murillo
45a55f064e Merge 2014-12-23 11:06:13 -08:00
Brian Burkhalter
0062f27c96 8030090: (fs) Add default methods to Path for derived methods
Use method bodies from sun.nio.fs.AbstractPath as default method implementations in Path.

Reviewed-by: alanb
2014-12-23 10:09:52 -08:00
Vinnie Ryan
befd7d1c25 8044445: JEP 229: Create PKCS12 Keystores by Default
Reviewed-by: mullan, weijun
2014-12-23 16:30:57 +00:00
Amanda Jiang
9589fd31c1 8065420: Eliminate internal API dependency from java/net/ResponseCache/ResponseCacheTest.java
Reviewed-by: chegar
2014-12-23 15:10:15 +00:00
Jesper Wilhelmsson
a2b3cf3583 Merge 2014-12-23 14:03:15 +01:00
Valerie Peng
fa447efe14 8049312: AES/CICO test failed with on several modes
Fixed error in calculating data sizes when using feedback modes

Reviewed-by: xuelei
2014-12-23 02:58:15 +00:00
Valerie Peng
2f10f1d200 8043349: Consider adding aliases for Ucrypto algorithm-only Cipher transformations
Add alias RSA and AES for RSA/ECB/PKCS1Padding and AES/ECB/PKCS5Padding.

Reviewed-by: wetmore
2014-12-23 02:36:48 +00:00
Vladimir Kozlov
832167be7f 8067985: merging hs-comp to hs blocked by some tests not updated in 8054892
Reviewed-by: iveresov
2014-12-22 14:35:40 -08:00
Vladimir Kozlov
1bda5768f3 8067972: Bring changes made to WhiteBox.java in 8047290 to that file new location in the top repo
Reviewed-by: jcoomes
2014-12-22 11:19:30 -08:00
Vladimir Kozlov
8bd2d4db6f Merge 2014-12-22 10:41:57 -08:00
Vladimir Kozlov
d0fe2e1ed5 Merge 2014-12-22 10:39:37 -08:00
Jesper Wilhelmsson
79439ff560 8067947: Regression test for JDK-6522873
Added a regression test that will fail if we allow extra characters after flag names

Reviewed-by: ctornqvi, tschatzl
2014-12-22 17:33:29 +01:00
Thomas Schatzl
52a4823950 8068018: Clean up friends of G1CollectedHeap
Remove unnecessary friend class declaration in the G1CollectedHeap class.

Reviewed-by: jwilhelm, jmasa
2014-12-23 15:48:32 +01:00
Phil Race
22f59ce99e Merge 2014-12-20 10:11:14 -08:00
Yumin Qi
5e2fcdcda0 Merge 2014-12-19 22:58:32 -08:00
Yumin Qi
ef9d3aa2a7 Merge 2014-12-19 22:52:02 -08:00
Alejandro Murillo
f507e301d3 Merge 2014-12-19 17:01:45 -08:00
Vladimir Ivanov
5fd1e54fc1 8067338: compiler/debug/TraceIterativeGVN.java segfaults
Reviewed-by: kvn
2014-12-19 16:42:40 -08:00
Joel Borggrén-Franck
9196ed684d 8061472: String.format in DeferredAttr.DeferredTypeMap constructor leads to excessive object creation
Reviewed-by: mcimadamore, vromero
2014-12-19 21:07:53 +01:00
Karen Kinnear
4f7ab1448e 8065366: Better private method resolution
Reviewed-by: hseigel, lfoltan, coleenp, ahgross
2014-12-19 11:48:50 -08:00
Volker Simonis
f36d8eb8f3 8067923: AIX: link libjvm.so with -bernotok to detect missing symbols at build time and suppress warning 1540-1639
Reviewed-by: goetz
2014-12-19 18:33:55 +01:00
Katja Kantserova
f1e461b61e 6977426: sun/tools tests can intermittently fail to find app's Java pid
Reviewed-by: dfuchs, jbachorik, egahlin, sjiang
2014-12-19 13:13:11 +01:00
Lana Steuck
6253fc4127 Added tag jdk9-b43 for changeset b74f34ddea43 2014-12-18 19:57:57 -08:00
Lana Steuck
8edd68a854 Added tag jdk9-b43 for changeset 592c5d3be509 2014-12-18 19:57:56 -08:00
Lana Steuck
d90d57cd11 Added tag jdk9-b43 for changeset 52310706ed47 2014-12-18 19:57:52 -08:00
Lana Steuck
d62d10cb78 Added tag jdk9-b43 for changeset 1eddc8b954d5 2014-12-18 19:57:51 -08:00
Lana Steuck
16817fe94b Added tag jdk9-b43 for changeset f5f19fe0e83b 2014-12-18 19:57:51 -08:00
Lana Steuck
cce553e64c Added tag jdk9-b43 for changeset c12e49897c5a 2014-12-18 19:57:49 -08:00
Lana Steuck
9605b3ca96 Added tag jdk9-b43 for changeset f323111baaa9 2014-12-18 19:57:48 -08:00
Lana Steuck
35fec5bd09 Added tag jdk9-b43 for changeset 2d5bf96c8f17 2014-12-18 19:57:47 -08:00
Lance Andersen
ddcbf61389 8067904: Additional DriverManager clean-up from 8060068
Reviewed-by: mchung
2014-12-18 18:51:28 -05:00
Mandy Chung
ec11dd0153 8067898: Disable verify-modules until JDK-8067479 is resolved
Reviewed-by: ksrini
2014-12-18 13:56:46 -08:00
Coleen Phillimore
feb09bc118 8067713: Move clean_weak_method_links for redefinition out of class unloading
Do this work during class redefinition, only verify clean during class unloading in debug mode.

Reviewed-by: sspitsyn, roland, kbarrett
2014-12-18 16:15:21 -05:00
Kim Barrett
57198d2b63 8067499: G1SATBCardTableModRefBS should not inherit from CardTableModRefBSForCTRS
G1SATBCardTableModRefBS inherits from CardTableModRefBS

Reviewed-by: mgerdin, brutisso, tschatzl
2014-12-18 13:26:37 -05:00
Jesper Wilhelmsson
12797a11c0 Merge 2014-12-22 17:40:46 +00:00
Thomas Schatzl
d530b1da99 8068036: assert(is_available(index)) failed in G1 cset
Some verification code iterated over the heap using the region mapping array. This is not allowed. Changed to use the regular iteration method with closure.

Reviewed-by: jwilhelm, brutisso
2014-12-22 16:49:24 +01:00
Thomas Schatzl
1be86b3412 8060025: Object copy time regressions after JDK-8031323 and JDK-8057536
Evaluate and improve object copy time by micro-optimizations and splitting out slow and fast paths aggressively.

Co-authored-by: Tony Printezis <tprintezis@twitter.com>
Reviewed-by: kbarrett, mgerdin, jmasa
2014-12-19 09:21:06 +01:00
Pavel Rappo
69df2fa9e5 8067870: Fix java.io.ObjectInputStream.PeekInputStream#skip
Reviewed-by: rriggs, alanb
2014-12-18 16:44:32 +00:00