stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,583 Commits 2 Branches 0 Tags 1.2 GiB
4fd805da91
Commit Graph

1907 Commits

Author SHA1 Message Date
Chris Hegarty
23d10238b1 8012343: Objects.requireNonNull(Object,Supplier) breaks genstubs build 
Reviewed-by: alanb
 2013-04-16 12:23:16 +01:00
Joe Darcy
dbb722dfb0 8011800: Add java.util.Objects.requireNonNull(T, Supplier<String>) 
Reviewed-by: alanb, dholmes, mduigou
 2013-04-15 18:31:48 -07:00
Andrew Brygin
c0e62cff31 8012112: java/awt/image/mlib/MlibOpsTest.java fails on sparc solaris 
Reviewed-by: prr, vadim
 2013-04-15 14:11:32 +04:00
Chris Hegarty
7d3f26a18f 8011799: CompletableFuture/Basic.java fails intermittently 
Reviewed-by: martin, alanb
 2013-04-14 19:17:30 +01:00
Chris Hegarty
cd4711df4d Merge 2013-04-13 21:51:36 +01:00
Chris Hegarty
be8d5c723d Merge 2013-04-13 20:16:00 +01:00
David Katleman
930dcf7d28 8012048: JDK8 b85 source with GPL header errors 
Reviewed-by: iris, mduigou, jjg
 2013-04-12 15:22:33 -07:00
Sergey Bylokhov
e227299954 8000629: [macosx] Blurry rendering with Java 7 on Retina display 
Reviewed-by: anthony, prr, flar
 2013-04-12 15:28:49 +04:00
Petr Pchelko
32995a0452 8010009: [macosx] Unable type into online word games on MacOSX 
Reviewed-by: anthony, dcherepanov
 2013-04-12 14:09:03 +04:00
Andrew Brygin
36ef0217a6 8011992: java/awt/image/mlib/MlibOpsTest.java failed since jdk7u25b05 
Reviewed-by: vadim
 2013-04-12 14:08:21 +04:00
Robert Field
60fae99960 8012028: Metafactory-generated lambda classes should be final 
8008941: isSynthetic() returns false for lambda instances

Reviewed-by: mduigou
 2013-04-12 20:23:13 -07:00
Henry Jen
3273287f58 8010279: java.util.Stream.min/max((Comparator)null) is not consistent in throwing (unspecified) NPE 
Reviewed-by: alanb, mduigou
 2013-04-12 12:41:18 -07:00
Xueming Shen
38e4efd784 8011647: Add java.time.Instant methods to java.nio.file.attribute.FileTime 
Added the toInstant()/from(Instant) to FileTime

Reviewed-by: alanb
 2013-04-12 12:03:00 -07:00
Sergey Malenkov
c1409aacef 4683761: Incomplete Introspection on nonpublic classes lead to IllegalAccessExceptions 
Reviewed-by: alexsch
 2013-04-11 19:12:59 +04:00
Mike Duigou
8b4ed5f8cc 8011200: (coll) Optimize empty HashMap and ArrayList 
Co-authored-by: Sergey Linetskiy <sergey.linetskiy@oracle.com>
Co-authored-by: John Rose <john.r.rose@oracle.com>
Reviewed-by: mduigou, alanb, bchristi, martin
 2013-04-10 12:43:18 -07:00
Stephen Colebourne
58af157d96 8011172: JSR 310 DateTime API Updates II 
Integration of JSR310 Date/Time API update

Co-authored-by: Roger Riggs <roger.riggs@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Reviewed-by: alanb, naoto, dholmes
 2013-04-12 07:57:35 -07:00
Lana Steuck
a10b11c7fe Merge 2013-04-09 15:14:31 -07:00
Chris Hegarty
dc6fd2d5dd 8005696: Add CompletableFuture 
Reviewed-by: chegar, martin
 2013-04-09 17:27:47 +01:00
Joe Darcy
2c7f3d292f 6298888: Add toGenericString to j.l.Class and getTypeName to j.l.reflect.Type 
6992705: Include modifiers in Class.toGenericString()

Class.toGenericString and supporting changes; additional reviews by Peter Levart

Reviewed-by: alanb
 2013-04-08 17:06:20 -07:00
Jim Gish
4b5d81c510 8006036: (process) cleanup code in java/lang/Runtime/exec/WinCommand.java 
Reviewed-by: lancea
 2013-04-08 15:29:24 -04:00
Joe Darcy
76a59cf150 8011590: More tests for core reflection modeling of default methods 
Reviewed-by: mduigou
 2013-04-05 18:20:12 -07:00
Christos Zoulas
a7b0073f5a 5001942: Missings SOCKS support for direct connections 
Add support for socksNonProxyHosts

Reviewed-by: chegar, khazra
 2013-04-05 12:12:34 -07:00
Petr Pchelko
9ff5db6260 8006941: [macosx] Deadlock in drag and drop 
7199783: Setting cursor on DragSourceContext does not work on OSX

Reviewed-by: anthony, serb
 2013-04-05 18:29:53 +01:00
Joe Darcy
fa0b9daa08 8004979: java.lang.reflect.Modifier.toString should include "default" 
Reviewed-by: mduigou
 2013-04-02 16:26:54 -07:00
Lana Steuck
88a9d69091 Merge 2013-04-02 16:17:54 -07:00
Jim Gish
4c7d3a9bd1 5015163: (str) String merge/join that is the inverse of String.split() 
7172553: A utility class that forms the basis of a String.join() operation

Integrate StringJoiner changes from lambda

Reviewed-by: alanb, mduigou
 2013-04-02 18:41:04 -04:00
Sean Coffey
9822b2cd84 8000529: Regression: SimpleDateFormat incorrectly parses dates formatted with Z and z pattern letters 
Reviewed-by: okutsu
 2013-04-25 21:12:35 +01:00
Joe Darcy
edbd8cf91c 8012044: Give more information about self-suppression from Throwable.addSuppressed 
Reviewed-by: alanb, dholmes
 2013-04-25 09:37:03 -07:00
Xueming Shen
0872993c6c 8012638: test/java/time/test/java/util/TestFormatter fails in UTC TZ 
Updated the offending test case

Reviewed-by: alanb
 2013-04-24 21:27:52 +00:00
Alan Bateman
3db24cefee 8005555: TEST_BUG: java/io/Serializable/accessConstants/AccessConstants.java should be removed 
Reviewed-by: chegar
 2013-04-24 19:03:07 +01:00
Lana Steuck
843e6e05e2 Merge 2013-04-23 15:07:48 -07:00
Alan Bateman
1dea05c94f 8012930: (fs) Eliminate recursion from FileTreeWalker 
Reviewed-by: chegar
 2013-04-23 15:01:44 +01:00
Lana Steuck
e82dcb36d6 Merge 2013-04-02 11:59:34 -07:00
Xueming Shen
3457ff4337 8007379: Base64.getMimeDecoder().decode() throws IAE for a non-base64 character after padding 
8008925: Base64.getMimeDecoder().decode() does not ignore padding chars

Updated implementation and spec for corner cases.

Reviewed-by: alanb
 2013-04-02 10:12:20 -07:00
Mike Duigou
7d45058eaa 8011199: Backout changeset JDK-7143928 (2b34a1eb3153) 
Reviewed-by: darcy, dholmes
 2013-04-01 20:51:40 -07:00
Mike Duigou
3e6daeda3a 7143928: Optimize empty HashMap and ArrayList 
Co-authored-by: Sergey Linetskiy <sergey.linetskiy@oracle.com>
Co-authored-by: John Rose <john.rose@oracle.com>
Reviewed-by: mduigou
 2013-04-01 20:15:48 -07:00
Dan Xu
2ffe97f06e 8010837: FileInputStream.available() throw IOException when encountering negative available values 
Remove the check in the native code to allow negative values

Reviewed-by: mchung
 2013-03-27 09:00:34 -07:00
Denis Fokin
36fd8181af 7075105: WIN: Provide a way to format HTML on drop 
Reviewed-by: uta, serb
 2013-03-27 16:19:51 +04:00
Lana Steuck
bd671cb7fa Merge 2013-03-26 12:04:35 -07:00
Martin Buchholz
edcaf23233 8010316: Improve handling of char sequences containing surrogates 
Fix and optimize codePointAt, codePointBefore and similar methods

Reviewed-by: sherman, okutsu, ulfzibis, kizune
 2013-03-26 13:36:51 -07:00
Martin Buchholz
2a57075d85 8007905: To add a system property to create zip file without using ZIP64 end table when entry count > 64k 
Provide a system property to inhibit ZIP64 mode for >64k entries

Reviewed-by: alanb, sherman
 2013-03-26 13:34:54 -07:00
Alexander Scherbatiy
d089002460 8007146: [macosx] Setting a display mode crashes JDK under VNC 
Reviewed-by: serb
 2013-03-21 16:50:35 +04:00
Mandy Chung
c9e6a41b99 8006104: Improve tests to test ".useParentHandlers" property set in the logging configuration 
Reviewed-by: alanb
 2013-03-20 09:50:07 -07:00
Anton Litvinov
58a945da1c 6550588: java.awt.Desktop cannot open file with Windows UNC filename 
Reviewed-by: art, uta
 2013-03-20 20:41:03 +04:00
Konstantin Shefov
f61a46ce67 8009880: TEST_BUG: Test java/beans/Introspector/TestTypeResolver.java should be modified again 
Reviewed-by: malenkov, alexsch
 2013-03-20 14:02:25 +04:00
Brian Goetz
5b1cca1b96 8001642: Add Optional<T>, OptionalDouble, OptionalInt, OptionalLong 
Reviewed-by: mduigou, darcy, alanb, jjb
 2013-03-19 16:05:34 -07:00
Lana Steuck
31330fc47a Merge 2013-03-12 19:04:49 -07:00
Lana Steuck
5adedccb9c Merge 2013-03-12 16:40:22 -07:00
Henry Jen
9db6479318 8001667: Comparator combinators and extension methods 
Reviewed-by: mduigou, briangoetz
 2013-03-08 15:45:06 -08:00
Alan Bateman
9849742625 8006000: TEST_BUG: java/lang/invoke/lambda/LambdaAccessControlTest.java fails intermittently 
Reviewed-by: chegar
 2013-03-08 12:03:26 +00:00
Chris Hegarty
7d6b4b81de 6370908: Add support for HTTP_CONNECT proxy in Socket class 
Co-authored-by: Damjan Jovanovic <damjan.jov@gmail.com>
Reviewed-by: chegar
 2013-03-07 10:07:13 +00:00
Vladimir Ivanov
9aba745d56 8009222: java.lang.IllegalArgumentException: not invocable, no method type when attempting to get getter method handle for a static field 
Reviewed-by: jrose, twisti
 2013-03-06 16:59:42 +04:00
Lana Steuck
4f62a2b334 Merge 2013-03-15 23:31:19 -07:00
Yiming Wang
a7f501c620 7183800: TEST_BUG: Update tests to run on Ubuntu 12.04 (localhost is 127.0.1.1) 
Reviewed-by: alanb, chegar
 2013-03-14 16:59:06 +00:00
Jim Gish
709f67b8f9 8002070: Remove the stack search for a resource bundle for Logger to use 
The fragile, vulnerable, stack crawling has been eliminated from findResourceBundle(String)

Reviewed-by: mchung, alanb
 2013-03-13 11:24:48 -04:00
Naoto Sato
16bd2e1298 8004240: Return value from getAdapterPrefence() can be modified 
Reviewed-by: okutsu
 2013-03-04 20:46:42 -08:00
Joe Darcy
bc576240bc 8009267: Restore isAnnotationPresent methods in public AnnotatedElement implementations 
Reviewed-by: jjg
 2013-03-04 19:42:56 -08:00
Chris Hegarty
3a216a7fdc 8008378: FJP.commonPool support parallelism 0, add awaitQuiescence 
Co-authored-by: Doug Lea <dl@cs.oswego.edu>
Reviewed-by: chegar
 2013-03-02 08:54:37 +00:00
Dan Xu
4994fe0840 8006645: TEST_BUG: java/nio/file/Files/CopyAndMove.java failing intermittently (sol) 
Fix test failures and update java doc of Files.move

Reviewed-by: alanb, chegar
 2013-03-01 14:12:59 -08:00
Sergey Malenkov
19bc54290f 7163696: JCK Swing interactive test JScrollBarTest0013 fails with Nimbus and GTK L&Fs 
Reviewed-by: alexsch
 2013-03-01 14:30:52 +04:00
Mike Duigou
5262142601 8008785: IdentityHashMap.values().toArray(V[]) broken by JDK-8008167 
Reviewed-by: alanb
 2013-02-27 11:00:20 -08:00
Edvard Wendelin
f5518d2c81 Merge 2013-02-27 18:13:20 +01:00
Edvard Wendelin
7ecb0fd433 Merge 2013-02-26 20:36:52 +01:00
Robert Field
b0dc9de25e 8008770: SerializedLambda incorrect class loader for lambda deserializing class 
Current thread's context ClassLoader was used to load class by name, pass class not name in serialization (Thank you Peter Levart for test and prototype. Thank you Sundar and Peter for unofficial reviews)

Reviewed-by: forax
 2013-02-26 10:38:58 -08:00
Chris Hegarty
4e9403c378 Merge 2013-02-26 11:06:49 +00:00
Krystal Mo
f5666f9a69 7087570: java.lang.invoke.MemberName information wrong for method handles created with findConstructor 
REF_invokeSpecial DMHs (which are unusual) get marked explicitly; tweak the MHI to use this bit

Reviewed-by: jrose, twisti
 2013-02-26 11:05:26 +00:00
Lana Steuck
38697490b4 Merge 2013-02-23 19:49:17 -08:00
Alan Bateman
f99a5d722e 8008793: SecurityManager.checkXXX behavior not specified for methods that check AWTPermission and AWT not present 
Reviewed-by: hawtin, mullan, dsamersoff, mchung
 2013-02-27 14:24:45 +00:00
Edvard Wendelin
2f5be3ab0d Merge 2013-02-25 08:44:00 +01:00
Lana Steuck
835c35dc91 Merge 2013-02-21 17:43:57 -08:00
Robert Field
56baa11720 8008356: Test LambdaSerialization.java failing 
Run in /othervm mode

Reviewed-by: ksrini
 2013-02-21 15:46:37 -08:00
Daniel D. Daugherty
5eb01d191d 8008352: java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh fails on MKS 
Use more portable pattern counting constructs in test driver.

Reviewed-by: sspitsyn, sla, coleenp
 2013-02-20 13:23:56 -08:00
Lana Steuck
09dadebbf1 Merge 2013-02-19 22:23:34 -08:00
Edvard Wendelin
cbfc80d987 Merge 2013-02-19 21:48:01 +01:00
Eric McCorkle
78fe727c6d 8008312: Re-enable MethodParameter tests in JDK 
Reviewed-by: darcy
 2013-02-19 17:09:25 +00:00
Konstantin Shefov
a97003cb22 8006070: TEST_BUG: Up and down the Y coordinate of the mouse position, the selected item doesn't change for the single list 
Reviewed-by: serb, anthony
 2013-02-19 20:00:02 +04:00
Konstantin Shefov
88eea092fb 8008379: TEST_BUG: Fail automatically with java.lang.NullPointerException 
Reviewed-by: serb, anthony
 2013-02-19 17:26:40 +04:00
Frank Ding
7886b3e26b 6429204: (se) Concurrent Selector.register and SelectionKey.interestOps can ignore interestOps 
Reviewed-by: alanb
 2013-02-18 08:14:18 +00:00
David Holmes
390cc1d7a1 Merge 2013-02-17 16:44:19 -05:00
Robert Field
381aecb7c2 8004970: Implement serialization in the lambda metafactory 
Reviewed-by: forax
 2013-02-16 12:36:54 -08:00
Vera Akulova
d273278133 8005920: After pressing combination Windows Key and M key, the frame, the instruction and the dialog can't be minimized 
Reviewed-by: serb, denis
 2013-02-15 17:46:39 +04:00
Chris Hegarty
5c9a25d2d2 8008223: java/net/BindException/Test.java fails rarely 
Reviewed-by: khazra, alanb
 2013-02-15 11:06:52 +00:00
Xueming Shen
a433a8918d 8008254: j.u.Calendar.JavatimeTest failed at TL b78 pit testing 
To use j.t.ZoneId zone name to keep round-trip

Reviewed-by: okutsu
 2013-02-15 01:17:31 +00:00
Lana Steuck
9b523dc375 Merge 2013-02-13 17:57:31 -08:00
Daniel D. Daugherty
ba9cf66b48 8007935: java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh should use $COMPILEJAVA for javac 
Reviewed-by: sspitsyn, alanb
 2013-02-13 13:22:31 -08:00
Lana Steuck
56014d30fc Merge 2013-02-13 12:38:28 -08:00
Lana Steuck
264f4dbe27 Merge 2013-02-13 11:25:14 -08:00
Vinnie Ryan
3d55cc1e02 8007934: algorithm parameters for PBE Scheme 2 not decoded correctly in PKCS12 keystore 
Reviewed-by: mullan
 2013-02-13 16:01:26 +00:00
Petr Pchelko
42b8720bef 7079260: InputContext leaks memory 
Replaced strong refs with weak refs

Reviewed-by: art, serb
 2013-02-13 15:27:29 +00:00
Vera Akulova
30a25e41d2 7161759: TEST_BUG: java/awt/Frame/WindowDragTest/WindowDragTest.java fails to compile, should be modified 
Added @build Util jtreg tag

Reviewed-by: serb, alexsch
 2013-02-13 18:01:18 +04:00
Joel Borggrén-Franck
e0eba88c1b 8007278: Rename j.l.r.AnnotatedElement.getAnnotations(Class) to getAnnotationsByType(Class) 
Reviewed-by: darcy, abuckley
 2013-02-13 10:36:36 +01:00
Lana Steuck
5a2e0c4105 Merge 2013-02-19 20:52:39 -08:00
Mike Duigou
71666c4c5a 8004561: Additional functional interfaces, extension methods and name changes 
Adds additional functional interfaces for primitives and "Bi" (two operand). Adds utility extension methods. Includes some name changes for existing functional interfaces per EG decisions.

Reviewed-by: briangoetz, darcy, chegar, dholmes
 2013-02-19 11:56:49 -08:00
Mike Duigou
9bb27cedcb 8007398: Peformance improvements to Integer and Long string formatting 
Co-authored-by: Steven Schlansker <stevenschlansker@gmail.com>
Reviewed-by: mduigou, martin, darcy, briangoetz
 2013-02-12 17:04:09 -08:00
John Zavgren
ae11ef7f7f 7188517: Check on '$' character is missing in the HttpCookie class constructor 
Modified the constructor code so that the cookie names are examined for leading dollar signs and if they do, an illegal argument exception is thrown.

Reviewed-by: chegar, khazra, michaelm
 2013-05-31 15:18:15 -04:00
Dan Xu
99e8d73193 8015628: Test Failure in closed/java/io/pathNames/GeneralSolaris.java 
Reviewed-by: alanb
 2013-05-31 13:34:27 -07:00
Alan Bateman
f3d7029319 8014854: (bf) CharBuffer.chars too slow with default implementation 
Reviewed-by: erikj, briangoetz, henryjen, psandoz, mduigou
 2013-05-31 12:17:30 +01:00
Chris Hegarty
608c513883 7107883: getNetworkPrefixLength() does not return correct prefix length 
Reviewed-by: alanb, michaelm
 2013-05-31 09:30:44 +01:00
Xueming Shen
9e918d6fbc 4759491: method ZipEntry.setTime(long) works incorrectly 
6303183: Support NTFS and Unix-style timestamps for entries in Zip files
7012856: (zipfs) Newly created entry in zip file system should set all file times non-null values
7012868: (zipfs) file times of entry in zipfs should always be the same regardless of TimeZone

To add suuport of Info-ZIP extended timestamp in extra data fields

Reviewed-by: martin, alanb
 2013-05-29 19:50:47 -07:00
Stephen Colebourne
73c043f49e 8007392: JSR 310: DateTime API Updates 
8007520: Update date/time classes in j.util and j.sql packages
8007572: Replace existing jdk timezone data at <java.home>/lib/zi with JSR310's tzdb

Integration of JSR310 Date/Time API for M7

Co-authored-by: Roger Riggs <roger.riggs@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Patrick Zhang <patrick.zhang@oracle.com>
Reviewed-by: darcy, alanb, naoto
 2013-02-12 09:25:43 -08:00
Mikhail Cherkasov
fc6a9c2d07 8005932: Java 7 on mac os x only provides text clipboard formats 
Reviewed-by: alexp, denis
 2013-02-08 22:08:10 +04:00
Daniel D. Daugherty
249b55b573 8007420: add test for 6805864 to com/sun/jdi, add test for 7182152 to java/lang/instrument 
Reviewed-by: coleenp, sspitsyn
 2013-02-11 10:07:01 -08:00
Doug Lea
724f325f44 8005697: Add StampedLock 
Reviewed-by: chegar, alanb, dice, martin
 2013-02-09 08:35:57 +00:00
Naoto Sato
ea5819f8d3 8007038: ArrayIndexOutOfBoundsException on calling localizedDateTime().print() with JapaneseChrono 
Reviewed-by: okutsu
 2013-02-08 09:35:14 -08:00
Lana Steuck
bab241d2e7 Merge 2013-02-05 11:11:53 -08:00
Edvard Wendelin
11036fb4d5 Merge 2013-02-05 15:35:35 +01:00
David Holmes
eb1726c151 Merge 2013-02-04 18:08:50 -05:00
Xueming Shen
db8ced219f 8006295: Base64.Decoder.wrap(java.io.InputStream) returns InputStream which throws unspecified IOException on attempt to decode invalid Base64 byte stream 
8006315: Base64.Decoder decoding methods are not consistent in treating non-padded data
8006530: Base64.getMimeDecoder().decode() throws exception for non-base64 character after adding =

Updated the spec to describe the expected behave explicitly and the implementation to follow

Reviewed-by: alanb, chegar, lancea
 2013-02-04 11:58:43 -08:00
Vinnie Ryan
ddbfa5fe53 8006994: Cleanup PKCS12 tests to ensure streams get closed 
Reviewed-by: mullan
 2013-02-04 17:20:26 +00:00
Chris Hegarty
b61bb15030 8007322: untangle ftp protocol from general networking URL tests 
Reviewed-by: alanb
 2013-02-02 17:15:13 +00:00
Andrew Brygin
01ea5d17ec 8004801: The image of BufferedImage.TYPE_INT_ARGB is blank 
Reviewed-by: prr
 2013-02-01 20:06:27 +04:00
Chris Hegarty
d0830009e8 8006395: Race in async socket close on Linux 
Reviewed-by: alanb, dsamersoff
 2013-02-01 06:51:37 +00:00
Brian Burkhalter
f7f0768c22 6355704: (fmt) %f formatting of BigDecimals is incorrect 
Reviewed-by: darcy
 2013-01-31 14:29:19 -08:00
Lana Steuck
15cde403c4 Merge 2013-01-31 14:10:14 -08:00
Xueming Shen
320ce960ce 8007298: Base64.getMimeDecoder().decode() throws IAE for a single non-base64 character 
8006526: Base64.Decoder.decode(String) spec contains a copy-paste mistake

To ignore single non-base64 char in mime decoding

Reviewed-by: alanb
 2013-01-31 13:13:14 -08:00
Joe Darcy
757d9cdeb9 8007115: Refactor regression tests for java.lang.reflect.Parameter 
Reviewed-by: emc
 2013-01-31 12:23:04 -08:00
Xueming Shen
907f0724ce 8005394: Base64.Decoder/Encoder.wrap(XStream) don't throw NPE for null args passed 
To check null for dec/enc.wrap methods

Reviewed-by: alanb
 2013-01-31 11:09:36 -08:00
David Buck
b3fa7187ae 7042126: (alt-rt) HashMap.clone implementation should be re-examined 
Test case for cr7042126. Issue only found in OracleJDK, but test case is valid for OpenJDK as well

Reviewed-by: mduigou
 2013-01-31 10:55:15 -08:00
Lana Steuck
40c0ad3990 Merge 2013-01-31 10:22:25 -08:00
Joel Borggrén-Franck
34e1726860 8005712: Simplify support for repeating annotations in j.l.r.AnnotatedElement 
8004919: AnnotationSupport uses possibly half-constructed AnnotationType instances

Implements the simplified semantics for repeating annotations and removes the incorrect obtaining of an AnnotationType

Reviewed-by: darcy, abuckley
 2013-01-31 10:10:34 +01:00
Lana Steuck
58717e9087 Merge 2013-01-29 20:19:48 -08:00
Joel Borggrén-Franck
b29b479461 8004698: Implement Core Reflection for Type Annotations 
Reviewed-by: darcy
 2013-01-29 10:32:49 +01:00
Sergey Malenkov
6d5f0df029 8005138: test/java/beans/Introspector/TestTypeResolver.java fails 
Reviewed-by: alexsch
 2013-01-24 17:57:02 +04:00
Sergey Bylokhov
2c1808e68d 8003173: [macosx] Fullscreen on Mac leaves an empty rectangle 
Reviewed-by: anthony, alexsch
 2013-01-24 17:50:03 +04:00
Akhil Arora
5dc4c11b2b 8004201: Add static utility methods to primitives to be used for redution operations 
Reviewed-by: darcy, mduigou, briangoetz, dholmes
 2013-01-25 16:13:39 -08:00
Henry Jen
293df92991 8005632: Extend java.util.Logger to use Supplier<String> for messages 
Reviewed-by: briangoetz, mduigou
 2013-01-25 16:13:32 -08:00
Vinnie Ryan
3727e751f6 8006855: PKCS12 test failures due to unsupported algorithm 
Reviewed-by: mullan
 2013-01-24 16:44:15 +00:00
Vinnie Ryan
7dcd0b38a8 8006591: Protect keystore entries using stronger PBE algorithms 
Reviewed-by: mullan
 2013-01-23 21:25:49 +00:00
Xueming Shen
60e625f275 Merge 2013-01-23 10:31:10 -08:00
Xueming Shen
c3343fdb49 8006773: test/java/util/zip/ZipFile/FinalizeZipFile.java failing intermittently 
Fixed the test case

Reviewed-by: alanb
 2013-01-23 10:29:50 -08:00
Rob McKenna
6c5679d418 8004729: Add java.lang.reflect.Parameter and related changes for parameter reflection 
Reviewed-by: darcy, forax, psandoz, dholmes, tbell
 2013-01-23 17:54:34 +00:00
Stephen Colebourne
df4d235c1f 8003680: JSR 310 Date/Time API 
Integration of JSR310 Date/Time API for M6

Co-authored-by: Roger Riggs <roger.riggs@oracle.com>
Co-authored-by: Richard Warburton <richard.warburton@gmail.com>
Co-authored-by: Michael Nascimento <misterm@gmail.com>
Reviewed-by: alanb, naoto, dholmes
 2013-01-22 20:59:21 -08:00
Stuart Marks
54752a2afe 8005646: TEST_BUG: java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup leaves process running 
Reviewed-by: mchung
 2013-01-22 18:30:49 -08:00
Stefan Karlsson
15d98b74e9 7140852: Add test for 7022100 
Reviewed-by: sspitsyn, coleenp
 2013-01-22 15:25:37 +01:00
Stefan Karlsson
fe173efccd 8006506: Add test for redefining methods in backtraces to java/lang/instrument tests 
Reviewed-by: sspitsyn, coleenp
 2013-01-22 13:53:53 +01:00
Alan Bateman
a23a1a942b 8004502: Compact Profiles contents 
Reviewed-by: dholmes, mchung
 2013-01-21 23:35:36 -05:00
Alan Bateman
3ca765dfbd 8004931: add/removePropertyChangeListener should not exist in subset Profiles of Java SE 
Reviewed-by: dholmes, mchung, ksrini
 2013-01-21 23:23:12 -05:00
Alan Bateman
99f3285106 8003255: (profiles) Update JAR file specification to support profiles 
Reviewed-by: dholmes, mchung, ksrini
 2013-01-21 23:20:42 -05:00
Doug Lea
3f14786363 8005311: Add Scalable Updatable Variables, DoubleAccumulator, DoubleAdder, LongAccumulator, LongAdder 
Reviewed-by: chegar, darcy, goetz
 2013-01-21 13:50:05 +00:00
Masayoshi Okutsu
6bc0d6d200 8004489: Add support for Minguo and Hijrah calendars to CalendarNameProvider SPI 
8006509: Add more calendar symbol names from CLDR

Reviewed-by: peytoia
 2013-01-21 15:41:30 +09:00
Masayoshi Okutsu
f9d0dd3d72 4745761: (cal) RFE: Support builder for constructing Calendar 
Reviewed-by: peytoia
 2013-01-21 12:04:55 +09:00
Chris Hegarty
6b32c387f1 8006560: java/net/ipv6tests/B6521014.java fails intermittently 
Reviewed-by: khazra, wetmore
 2013-01-20 09:37:51 +00:00
Alan Bateman
69b0c6aad4 6939260: (fs) BasicFileAttributes.lastModifiedTime() should return last modified time with higher precision 
Reviewed-by: chegar
 2013-01-18 18:48:44 +00:00
Jim Gish
a7f43eaad5 8006534: CLONE - TestLibrary.getUnusedRandomPort() fails intermittently-doesn't retry enough times 
Increase number of retries to twice the number of ports in the reserved range

Reviewed-by: mduigou
 2013-01-17 15:09:46 -05:00
Kurchi Subhra Hazra
8f2bd71dc9 7171415: java.net.URI.equals/hashCode not consistent for some URIs 
Rewrite URI.hashCode() to consider encoded characters, also reviewed by vitalyd@gmail.com, schlosna@gmail.com

Reviewed-by: chegar
 2013-01-17 14:50:02 -08:00
Lana Steuck
270d599981 Merge 2013-01-16 15:57:25 -08:00
Rob McKenna
bdca3e8f8c 8005618: TEST_BUG: java/lang/ProcessBuilder/Basic.java failing intermittently 
Reviewed-by: alanb, martin, dholmes
 2013-01-15 19:58:22 +00:00
Alexander Scherbatiy
97013ba028 8003978: closed/javax/swing/JRootPane/bug4670486.java fails since jdk7u12b01 on macosx 
Reviewed-by: serb, leonidr
 2013-01-15 12:49:03 +04:00
Naoto Sato
9fa2377054 7162007: Clean up i18n related caches 
Reviewed-by: okutsu, ohair
 2013-01-14 11:09:53 -08:00
Olivier Lagneau
546e2eb164 7131459: [Fmt-De] DecimalFormat produces wrong format() results when close to a tie 
Reviewed-by: darcy
 2013-01-11 15:39:08 -08:00
Alan Bateman
c12b624078 8005978: shell tests need to use the $COMPILEJDK for javac, jar and other tools 
Reviewed-by: chegar
 2013-01-11 20:19:55 +00:00
Alan Bateman
36e2ef2ba8 8005566: (fs) test/java/nio/file/Files/Misc.java failing (sol) 
Reviewed-by: chegar
 2013-01-11 12:27:57 +00:00
Joe Darcy
3dfc6b7512 8006062: Add @Repeatable to repeating annotations regression tests in JDK repo 
Reviewed-by: jjg
 2013-01-10 21:12:27 -08:00
Mandy Chung
3243aaf47a 8005615: Java Logger fails to load tomcat logger implementation (JULI) 
Reviewed-by: alanb, ahgross
 2013-01-10 19:43:36 -08:00
Jim Gish
5c5820e950 8005582: java/lang/Runtime/exec/WinCommand.java intermittent test failures 
Remove file-deletion code at cleanup which conflicts with jtreg cleanup

Reviewed-by: chegar
 2013-01-10 15:09:45 -05:00
Brent Christian
f7eb6cd556 8005962: TEST_BUG: java/util/Properties/MacJNUEncoding can fail in certain environments 
Test script now sets LC_ALL, other small changes, relocate test

Reviewed-by: naoto, alanb
 2013-01-10 10:21:44 -08:00
Sean Mullan
86b40c8697 Merge 2013-01-09 08:59:58 -05:00
Sean Mullan
d01edb0815 Merge 2013-01-08 19:02:55 -05:00
Sean Mullan
b492dc9bac 7019834: Eliminate dependency from PolicyFile to com.sun.security.auth.PrincipalComparator 
Add new java.security.Principal.implies method

Reviewed-by: alanb
 2013-01-08 19:00:12 -05:00
Dan Xu
6cc211f4e1 8002306: (se) Selector.open fails if invoked with thread interrupt status set [win] 
Reviewed-by: alanb
 2013-01-08 20:37:27 +00:00
Stuart Marks
f660de4e1e 7187882: TEST_BUG: java/rmi/activation/checkusage/CheckUsage.java fails intermittently 
Tighten up JavaVM test library API, and adjust tests to match.

Reviewed-by: mchung, dmocek
 2013-01-07 18:09:07 -08:00
Brent Christian
b21bc8e16d 8003228: (props) sun.jnu.encoding should be set to UTF-8 [macosx] 
Hard-code sun.jnu.encoding to UTF-8 on Mac

Reviewed-by: naoto
 2013-01-07 13:19:03 -08:00
Lana Steuck
b7af263526 Merge 2012-12-28 18:36:41 -08:00
Lana Steuck
177206a185 Merge 2012-12-28 18:30:56 -08:00
Lana Steuck
33a20f586c Merge 2013-01-01 17:49:22 -08:00
Chris Hegarty
c2f4000a6f 8005556: java/net/Socks/SocksV4Test.java is missing @run tag 
Reviewed-by: alanb
 2012-12-29 11:00:15 +00:00
Xue-Lei Andrew Fan
6d41a58c82 7109274: Restrict the use of certificates with RSA keys less than 1024 bits 
This restriction is applied via the Java Security property, "jdk.certpath.disabledAlgorithms". This will impact providers that adhere to this security property.

Reviewed-by: mullan
 2012-12-28 00:48:12 -08:00
Yuka Kamiya
ada3653e48 8005277: Regression in JDK 7 in Bidi implementation 
Reviewed-by: okutsu
 2012-12-28 15:07:08 +09:00
Masayoshi Okutsu
12ae00bd7d 8005471: DateFormat: Time zone info is not localized when adapter is CLDR 
Reviewed-by: peytoia
 2012-12-28 14:13:10 +09:00
Chris Hegarty
d2bce7f267 8003981: Support Parallel Array Sorting - JEP 103 
Co-authored-by: David Holmes <david.holmes@oracle.com>
Co-authored-by: Doug Lea <dl@cs.oswego.edu>
Reviewed-by: chegar, forax, dholmes, dl
 2012-12-27 21:55:24 +00:00
Yong Jeffrey Huang
2185318b56 Merge 2012-12-23 19:11:15 -08:00
Joe Wang
7dd77a4b62 8005280: (props) Improve test coverage for small XML parser 
Added a few more invalid XML files, international characters to LoadAndStore test, and a behavior compatibility test.

Reviewed-by: alanb, lancea
 2012-12-21 17:29:23 -08:00
Stuart Marks
1fd4da4d29 8005290: remove -showversion from RMI test library subprocess mechanism 
Reviewed-by: jgish, chegar, dmocek
 2012-12-20 20:11:45 -08:00
Yong Jeffrey Huang
06be28ce8d 7195759: ISO 4217 Amendment 154 
Reviewed-by: naoto
 2012-12-20 18:53:46 -08:00
David Katleman
306cab1006 8004982: JDK8 source with GPL header errors 
Reviewed-by: ohair
 2012-12-20 16:24:50 -08:00
Alan Bateman
50185a4371 8005281: (props) loadFromXML/storeToXML with small parser is not thread safe 
Reviewed-by: mchung
 2012-12-20 20:40:04 +00:00
Stuart Marks
d4eb039764 8001040: Rework RMI model 
Reviewed-by: alanb, ahgross, coffeys, dmocek
 2013-02-27 14:17:05 -08:00
Alan Bateman
4ce906db2b 8005248: (props) Integrate small footprint parser into Properties 
Reviewed-by: joehw, mchung, psandoz, erikj
 2012-12-19 14:53:33 +00:00
Lana Steuck
5c4f1d7778 Merge 2012-12-18 16:14:59 -08:00
Joe Darcy
407aefdc02 8005042: Add Method.isDefault to core reflection 
Reviewed-by: alanb, forax, mduigou, jgish, mchung
 2012-12-18 14:44:13 -08:00
Chris Hegarty
00802749ea 8005081: java/util/prefs/PrefsSpi.sh fails on macos-x 
Reviewed-by: alanb
 2012-12-17 16:27:05 +00:00
Sergey Malenkov
aed660dc95 8005065: [findbugs] reference to mutable array in JavaBeans 
Reviewed-by: alexsch
 2012-12-17 16:58:56 +04:00
Alexey Utkin
c5c34df7bf 8004928: TEST_BUG: Reduce dependence of CoreLib tests from the AWT subsystem 
The tests were refactored to drop AWT dependence where it was possible.

Reviewed-by: alanb, mchung
 2012-12-17 14:34:37 +04:00
Lana Steuck
166cf4fbc1 Merge 2012-12-16 22:09:28 -08:00
Lana Steuck
0118983407 Merge 2012-12-14 13:14:33 -08:00
Rob McKenna
7524cd99c1 8000525: Java.net.httpcookie api does not support 2-digit year format 
Reviewed-by: chegar
 2012-12-13 15:28:40 +00:00
Mark Sheppard
c9063f559f 8003890: corelibs test scripts should pass TESTVMOPTS 
Reviewed-by: chegar, alanb
 2012-12-13 14:47:35 +00:00
Chris Hegarty
453bef09b0 8004675: Inet6Address.getHostAddress should use string scope identifier where available 
...and some minor stylistic cleanup

Reviewed-by: khazra, dsamersoff, michaelm
 2012-12-13 14:33:32 +00:00
Chris Hegarty
2f8cd2937d 8004925: java/net/Socks/SocksV4Test.java failing on all platforms 
Reviewed-by: alanb, dsamersoff
 2012-12-13 09:55:55 +00:00
Jim Gish
3e23931d0c 8004651: TEST: java/util/logging/CheckLockLocationTest.java failed to delete file (win) 
Failure to delete test log file should be a warning instead of test failure

Reviewed-by: mduigou, smarks
 2012-12-12 15:37:27 -08:00
Stuart Marks
38887c7167 8004748: clean up @build tags in RMI tests 
Reviewed-by: alanb, darcy, mchung
 2012-12-12 09:53:01 -08:00
Mike Duigou
20d79bf440 8004905: Correct license of test to remove classpath exception 
Reviewed-by: akhil
 2012-12-11 20:49:44 -08:00
Akhil Arora
ee1832fd74 8003246: Add InitialValue Supplier to ThreadLocal 
Reviewed-by: mduigou, forax, dl, chegar, briangoetz
 2012-12-11 15:33:16 -08:00
Masayoshi Okutsu
78a8ed73a2 8000983: Support narrow display names for calendar fields 
8003267: Support generic time zone names in TimeZoneNameProvider (SPI)

Reviewed-by: naoto
 2012-12-10 10:52:11 +09:00
Robert Field
846f0f2ded 8003881: Prevent lambda implementing inner classes from allowing the creation of new instances 
Lambda implementing inner classes now has private constructor (thanks Kumar)

Reviewed-by: ksrini
 2012-12-06 21:55:55 -08:00
Jim Gish
aab1dbdc30 8004317: TestLibrary.getUnusedRandomPort() fails intermittently, but exception not reported 
Reviewed-by: alanb, dmocek, smarks
 2012-12-05 21:08:14 -08:00
Edvard Wendelin
f92370665e Merge 2013-02-03 23:25:38 +01:00
Jim Gish
f436d23492 8003596: TEST_BUG: java/util/logging/CheckLockLocationTest.java failing [win] 
Reviewed-by: alanb
 2012-12-04 20:21:19 +00:00
Lana Steuck
0e089aadcd Merge 2012-12-04 11:46:27 -08:00
Krystal Mo
e6ab16c283 8004066: TEST_BUG: test/java/lang/Math/DivModTests.java assumes ArithmeticException message 
Reviewed-by: twisti, alanb, dholmes
 2012-12-04 15:10:03 +00:00
Alan Bateman
d2d5213b87 8003846: Override mechanism for currency data should not require creating currency.properties in java.home 
Reviewed-by: naoto
 2012-12-02 16:37:31 +00:00
Xueming Shen
e78a1eb083 8004212: java.util.Base64 methods decodeArray and decodeBuffer should return the number of bytes written 
To return the length instead of position

Reviewed-by: alanb
 2012-12-01 11:36:25 -08:00
Lana Steuck
76863b84de Merge 2012-11-30 17:09:05 -08:00
Lana Steuck
351dbc4683 Merge 2012-11-30 16:33:50 -08:00
Kurchi Subhra Hazra
d7cae9afff 7197662: (prefs) java/util/prefs/AddNodeChangeListener.java fails by timeout or by "couldn't get file lock" 
Set -Djava.util.prefs.userRoot to current working directory of user in the prefs tests

Reviewed-by: alanb, chegar, weijun, dxu
 2012-11-30 12:00:07 -08:00
Staffan Larsen
c1126e3727 7155168: java/util/TimeZone/Bug6912560.java: expected Asia/Tokyo 
Reviewed-by: okutsu
 2012-11-30 08:17:02 +01:00
Jim Gish
7aed72aa11 8003380: Compiler warnings in logging test code 
Use generics, suppress warnings where appropriate, remove unused imports, etc.

Reviewed-by: lancea, chegar
 2012-11-29 12:28:02 +00:00
Joel Borggrén-Franck
36464f41e2 7154390: Add support for repeating annotations in j.l.r.AnnotatedElement 
Reviewed-by: darcy
 2012-11-28 09:21:37 -08:00
Xueming Shen
ff1d49bc5b 8004088: hg push for bug#4235519 failed to push all files 
Pushed all base64 files

Reviewed-by: alanb, mduigou
 2012-11-27 22:07:11 -08:00
Rob McKenna
f0bbdd0834 8003597: TEST_BUG: Eliminate dependency on javaweb from closed net tests 
Reviewed-by: chegar
 2012-11-28 00:47:38 +00:00
Chris Hegarty
24fde021e4 8003833: Spurious NPE from Socket.getIn/OutputStream 
Reviewed-by: alanb, dsamersoff
 2012-11-27 17:15:19 +00:00
Sergey Bylokhov
bfc0bfcd8e 8002308: [macosx] 7198229 should be applied to the user action only 
Reviewed-by: anthony, skovatch
 2012-11-27 17:03:19 +04:00
Sean Mullan
033919cce4 Merge 2012-11-26 08:34:25 -05:00
Sean Mullan
3f59d3882d Merge 2012-11-26 08:23:20 -05:00
Sean Mullan
c9b91fa45a 7167056: Clarify that BasicPermission names that contain non-wildcard asterisks are not invalid 
Reviewed-by: weijun, xuelei
 2012-11-26 08:12:19 -05:00
Alexey Utkin
d869bfa179 7162111: TEST_BUG: change tests run in headless mode [macosx] (open) 
In problem tests detection of AWT headless mode was introduced or AWT dependence was removed.

Reviewed-by: alanb
 2012-11-26 15:54:39 +04:00
David Buck
df3c665be3 7198904: (alt-rt) TreeMap.clone is broken 
Test case for cr7198904. Issue only found in OracleJDK, but test case is valid for OpenJDK as well

Reviewed-by: mduigou, dholmes
 2012-11-20 21:35:18 -08:00
Lana Steuck
822139baf8 Merge 2012-11-20 11:49:27 -08:00
Sergey Malenkov
f19ad0fb5b 8003333: Regression: java/beans/EventHandler/Test6277266.java fails with ACE 
Reviewed-by: art
 2012-11-20 18:56:01 +04:00
Darryl Mocek
52caa8646b 6563318: RMI data sanitization 
Reviewed-by: ahgross, hawtin, mchung, smarks
 2012-11-19 13:54:12 -08:00
Naoto Sato
6c62e2d0f1 7199750: Loading sequence of service provider is changed 
Reviewed-by: okutsu
 2012-11-15 20:17:05 -08:00
Jim Gish
f439018255 6244047: impossible to specify directories to logging FileHandler unless they exist 
Reviewed-by: alanb
 2012-11-15 13:46:45 +00:00
Alan Bateman
8c308db579 8003285: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java fails again [macosx] 
Reviewed-by: chegar
 2012-11-14 12:56:26 +00:00
Mike Duigou
96aa3fad5a 7088913: Add compatible static hashCode(primitive) to primitive wrapper classes 
Adds static utility methods to each primitive wrapper class to allow calculation of a hashCode value from an unboxed primitive.

Reviewed-by: darcy, smarks, dholmes
 2012-11-13 20:02:48 -08:00
Masayoshi Okutsu
aaa52056e9 8000986: Split java.util.spi.CalendarDataProvider into week parameters and field names portions 
Reviewed-by: naoto
 2012-11-12 11:12:29 +09:00
Alan Bateman
86d36e5d55 8003253: TEST_BUG: java/nio/channels/AsynchronousChannelGroup/Unbounded.java hang intermittently [win] 
Reviewed-by: chegar
 2012-11-11 10:05:37 +00:00
Roger Riggs
5d67e2bbb1 6282196: There should be Math.mod(number, modulo) methods 
Added the requested methods

Reviewed-by: darcy, emcmanus, alanb
 2012-11-07 20:50:09 -08:00
Naoto Sato
bb434e94b4 8001205: Calendar.getDisplayName(...): Returns null when provider is SPI but there is no SPI implementation 
8001562: Collator.getAvailableLocales() doesn't return all locales for which localized instances are available

Reviewed-by: okutsu
 2012-11-07 15:08:28 -08:00
Chris Hegarty
90f2168fa2 7201071: InetSocketAddress serialization issue 
Reviewed-by: alanb, michaelm, skoivu
 2012-11-07 14:26:41 +00:00
Daniel Fuchs
f2eac8a30a 6720349: (ch) Channels tests depending on hosts inside Sun 
This changeset make the nio tests start small TCP or UDP servers from within the tests, instead of relying on external services.

Reviewed-by: alanb
 2012-11-07 13:24:39 +01:00
Lana Steuck
cae6890e31 Merge 2012-11-06 18:41:01 -08:00
Yuka Kamiya
81afea6146 7198195: Support Unicode 6.2.0 
Reviewed-by: okutsu
 2012-11-07 09:58:39 +09:00
Jiangli Zhou
f3e4fda6ed 7197210: java/lang/invoke/CallSiteTest.java failing on armsflt 
Reduce work load and set longer timeout for java/lang/invoke tests.

Reviewed-by: kvn, twisti
 2012-11-05 12:51:14 -05:00
Sean Mullan
4e6425e134 Merge 2012-11-05 12:08:04 -05:00
Sean Mullan
4cae4b0457 Merge 2012-11-05 10:33:18 -05:00
Sean Mullan
5b23307a8f 7171570: JEP 124 Potential API Changes 
Reviewed-by: vinnie, xuelei
 2012-11-05 10:30:49 -05:00
Alan Bateman
f2aa8d9df9 8000330: (fc) FileChannel.truncate issues when given size > file size 
8002180: (fc) FileChannel.map does not throw NPE if MapMode specified as null

Reviewed-by: chegar
 2012-11-04 14:07:35 +00:00
Lana Steuck
4a88c62d44 Merge 2012-11-02 17:44:31 -07:00
Mandy Chung
d3ccd20d1f 7197546: (proxy) Reflect about creating reflective proxies 
Reviewed-by: alanb, jdn, jrose
 2012-11-02 16:50:23 -07:00
Alan Bateman
430592a30e 7197491: update copyright year to match last edit in jdk8 jdk repository 
Reviewed-by: chegar, ksrini
 2012-11-02 15:50:11 +00:00
Yuka Kamiya
38087c7a48 8001209: Evaluate findbugs reprot for java.text.ChoiceFormat 
Reviewed-by: okutsu
 2012-11-02 23:17:33 +09:00
Naoto Sato
799007c62d 8001440: CLDR adapter: Invalid number extension in language tag causes exception in NumberFormat.format() 
Reviewed-by: okutsu
 2012-11-01 13:28:47 -07:00
Lana Steuck
9faa8df101 Merge 2012-10-31 09:25:20 -07:00
Lana Steuck
bbf2d20d03 Merge 2012-10-31 08:29:44 -07:00
Konstantin Shefov
85947c2f2c 7072120: No mac os x support in several regression tests 
Reviewed-by: anthony, serb
 2012-10-30 12:47:35 +01:00
Jim Gish
a865f8b91a 6206780: (str) Forwarding append methods in String{Buffer,Builder} are inconsistent 
Update StringBuilder & StringBuffer to consistently handle forwarding to AbstractStringBuilder. Some additional cleanup (removal of refs to sub-classes from AbstractStringBuilder)

Reviewed-by: chegar, alanb, mduigou
 2012-10-29 16:51:59 -07:00
Naoto Sato
1203231cf9 8000997: Multiple locale sensitive services cannot be loaded 
Reviewed-by: okutsu
 2012-10-29 10:42:41 -07:00
Abhijit Saha
1cb7e050ff Merge 2012-10-26 10:01:13 -07:00
Lana Steuck
b8265239b8 Merge 2012-10-25 20:32:10 -07:00
Jim Gish
07f94ef8bc 7159567: inconsistent configuration of MemoryHandler 
Reviewed-by: mchung, alanb
 2012-10-25 15:04:09 -07:00