stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,531 Commits 2 Branches 0 Tags 1.2 GiB
1ae6dc3825
Commit Graph

3681 Commits

Author SHA1 Message Date
Amy Lu
765cd7602c 8142370: Move java/util/concurrent/Phaser/Basic.java to tier 2 
Reviewed-by: darcy, martin
 2015-11-10 13:15:01 +08:00
Alejandro Murillo
b96356c53b Merge 2015-11-09 20:37:05 -08:00
Joe Darcy
3cc6f8e724 8142369: Move TestLocalTime.java to tier 2 
Reviewed-by: lancea, sherman
 2015-11-09 18:27:43 -08:00
Rajan Halade
7ff9b4ac29 8048356: SecureRandom default provider tests 
Reviewed-by: wetmore
 2015-11-10 01:38:35 +03:00
Iris Clark
2f8616e7b4 Merge 2015-11-09 10:57:01 -08:00
Phil Race
581b95fee3 Merge 2015-11-09 09:05:20 -08:00
Roger Riggs
fe2786af5f 8138566: (Process) java.lang.Process.allChildren specification clarification 
8140213: Process/ProcessHandle.onExit() spec need to be improved
8140250: (process) Process.info description is inaccurate

Rename to descendants() and clarify

Reviewed-by: psandoz
 2015-11-09 11:02:07 -05:00
Alejandro Murillo
7bbbc98da3 Merge 2015-11-06 11:11:53 -08:00
Prasanta Sadhukhan
86cf3935f7 7161283: [macosx]filedialog didn't pop up for awt test InvalidParametersNativeTest 
Reviewed-by: serb, rchamyal
 2015-11-06 19:13:16 +03:00
Prasanta Sadhukhan
12667cd360 8020448: Test closed/java/awt/font/JNICheck/JNICheck.sh fails on Solaris 11 since 7 FCS 
Reviewed-by: azvegint, rchamyal
 2015-11-05 14:08:51 +03:00
Tobias Hartmann
b45249a128 8141393: [TESTBUG] VMOptionsTest.java fails on ARM 
The test should not assume that CompactStrings is enabled by default on all platforms.

Reviewed-by: roland
 2015-11-05 09:08:42 +01:00
Paul Sandoz
b6f45b1889 8033148: Lexicographic comparators for arrays 
Reviewed-by: jrose, chegar, bchristi, mduigou
 2015-11-04 16:44:38 +01:00
Joe Darcy
03a416db62 8141368: Typo in java/lang/Class/IsEnum.java test 
Reviewed-by: jjg
 2015-11-03 17:41:38 -08:00
David Dehaven
4e50c75aa6 Merge 2015-11-03 12:04:12 -08:00
David Dehaven
c0215a77a2 Merge 2015-11-03 09:45:39 -08:00
Roger Riggs
937b5e1d5e 8139345: java/lang/ProcessHandle/TreeTest.java test fails with ... Wrong number of children expected [3] but found [2] 
Reviewed-by: darcy
 2015-11-03 10:20:14 -05:00
Tobias Hartmann
4ed5b73f3d 8141132: JEP 254: Compact Strings 
Adopt a more space-efficient internal representation for strings.

Co-authored-by: Brent Christian <brent.christian@oracle.com>
Co-authored-by: Vivek Deshpande <vivek.r.deshpande@intel.com>
Co-authored-by: Charlie Hunt <charlie.hunt@oracle.com>
Co-authored-by: Vladimir Kozlov <vladimir.kozlov@oracle.com>
Co-authored-by: Roger Riggs <roger.riggs@oracle.com>
Co-authored-by: Xueming Shen <xueming.shen@oracle.com>
Co-authored-by: Aleksey Shipilev <aleksey.shipilev@oracle.com>
Co-authored-by: Sandhya Viswanathan <sandhya.viswanathan@intel.com>
Reviewed-by: alanb, bdelsart, coleenp, iklam, jiangli, jrose, kevinw, naoto, pliden, roland, smarks, twisti
 2015-11-03 09:42:11 +01:00
Iris Clark
321ddf167f Merge 2015-11-01 09:49:05 -08:00
Anton Litvinov
943ce6067c 8132503: [macosx] Chinese full stop symbol cannot be entered with Pinyin IM on OS X 
Reviewed-by: alexsch, kizune
 2015-10-30 13:23:35 +03:00
Phil Race
b83813f43a 8138817: JNI warnings loading fonts on MacOSX 
Reviewed-by: serb, alexsch
 2015-10-29 15:17:57 -07:00
David Holmes
90176d92ba Merge 2015-10-29 21:38:11 -04:00
Chris Plummer
5b3684cf37 8140189: [TESTBUG] Get rid of "@library /../../test/lib" in jtreg tests 
Use new external.lib.roots property in TEST.ROOT so /../../test/lib is not needed.

Reviewed-by: mseledtsov, sla, iklam
 2015-10-29 12:02:53 -07:00
Sergey Bylokhov
6b5651d4b8 8134732: [TEST_BUG] Test java/awt/applet/Applet/AppletFlipBuffer.java fails on Windows with AWTException 
Reviewed-by: azvegint, yan
 2015-10-28 16:42:49 +03:00
Brent Christian
084b341c80 8138824: java.lang.String: spec doesn't match impl when ignoring case - equalsIgnoreCase(), regionMatches() 
Reviewed-by: naoto, rriggs
 2015-10-27 09:20:24 -07:00
Prasanta Sadhukhan
b9bde0f1ce 7077412: [TEST_BUG]closed/java/awt/print/PrinterJob/PaintText.java failed (timeout error) 
Reviewed-by: azvegint, serb
 2015-10-27 14:14:08 +03:00
Michael Haupt
43fd9baef4 8136967: revert all changes applied to obtain information about 8131129 
Reviewed-by: sundar
 2015-10-27 09:09:37 +01:00
Rachna Goel
4fc5003ff5 8061287: Update i18n tests to remove references of jre dir 
Updated PropertiesTest.sh to remove references of jre dir.

Reviewed-by: naoto, peytoia
 2015-10-26 19:49:22 +05:30
Alexandre Iline
9cbe14b4df 8140336: Add @modules for exported dependencies to jdk_core tests 
Reviewed-by: alanb, mchung
 2015-10-27 20:06:02 -07:00
Iris Clark
b7cb99d927 Merge 2015-10-25 19:16:39 -07:00
Phil Race
6ca895574e Merge 2015-10-23 10:50:34 -07:00
Phil Race
5c26723516 8132890: Text overlapping on dot matrix printers 
Reviewed-by: jgodinez, serb
 2015-10-21 09:21:25 -07:00
Mikhail Cherkasov
d9ebc2b4c2 8136763: [macosx] java always returns only one value for "text/uri-list" dataflavor even if several files were copied 
Reviewed-by: alexsch, serb
 2015-10-21 18:58:19 +03:00
Sergey Bylokhov
b96af1d249 8138764: In some cases the usage of TreeLock can be replaced by other synchronization 
Reviewed-by: alexp, alexsch
 2015-10-21 18:32:56 +03:00
Semyon Sadetsky
d910e3843f 8022334: After calling frame.toBack() dialog goes to the back on Ubuntu 12.04 
Reviewed-by: alexsch, serb
 2015-10-20 15:59:51 +03:00
Semyon Sadetsky
d1544f66eb 8011616: JWindow.getLocation and JWindow.getLocationOnScreen return different values on Unity 
Reviewed-by: alexsch, serb
 2015-10-20 15:42:59 +03:00
Renjith Alexander
1127171d12 8136592: [TEST_BUG] Fix 2 platform-specific closed regtests for jigsaw 
Reviewed-by: serb, yan
 2015-10-20 12:42:21 +03:00
Paul Sandoz
5e8d2b8ebd 8080418: Add Optional.or() 
Reviewed-by: chegar, forax, scolebourne
 2015-10-19 11:28:50 -07:00
Sergey Bylokhov
206483e8b3 6815345: java.awt.Component.createImage(int width,int height) should remove behavioral optionality 
Reviewed-by: prr, ssadetsky
 2015-10-18 13:33:20 +03:00
Sean Coffey
7af86aa369 6907252: ZipFileInputStream Not Thread-Safe 
Reviewed-by: sherman
 2015-10-15 09:33:03 +01:00
Joe Darcy
655a976e65 8136799: Port fdlibm cbrt to Java 
Reviewed-by: bpb
 2015-10-14 16:17:08 -07:00
Doug Lea
c38b0eaba5 8134853: Bulk integration of java.util.concurrent classes 
8080939: ForkJoinPool and Phaser deadlock
8044616: Clients of Unsafe.compareAndSwapLong need to beware of using direct stores to the same field
8071638: [JAVADOC] Buggy example in javadoc for afterExecute to access a submitted job's Throwable
8043743: Data missed in java.util.concurrent.LinkedTransferQueue
8054446: Repeated offer and remove on ConcurrentLinkedQueue lead to an OutOfMemoryError
8031374: TEST_BUG: java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java fails Intermittently
8034208: Cleanup to test/java/util/concurrent/BlockingQueue/Interrupt.java
8035661: Test fix java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java from jsr166 CVS
8062841: ConcurrentHashMap.computeIfAbsent stuck in an endless loop
8073208: javadoc typo in java.util.concurrent.Executor
8073704: FutureTask.isDone returns true when task has not yet completed
8037093: java/util/concurrent/locks/Lock/TimedAcquireLeak.java fails intermittently
8022642: ScheduledThreadPoolExecutor with zero corePoolSize create endlessly threads
8065320: Busy loop in ThreadPoolExecutor.getTask for ScheduledThreadPoolExecutor
8129861: High processor load for ScheduledThreadPoolExecutor with 0 core threads
8051859: ScheduledExecutorService.scheduleWithFixedDelay fails with max delay
7146994: example afterExecute for ScheduledThreadPoolExecutor hangs

Reviewed-by: martin, psandoz, chegar
 2015-10-13 16:45:35 -07:00
Doug Lea
0f49a089d6 8134855: Bulk integration of java.util.concurrent.locks classes 
8051848: ReentrantReadWriteLock.ReadLock fails on unlock by different thread
8049843: Lack of save / restore interrupt mechanism undermines the StampedLock

Reviewed-by: martin, psandoz, chegar
 2015-10-13 16:35:22 -07:00
Doug Lea
2d8e9b323c 8134852: Integrate fork/join with API enhancements 
Reviewed-by: martin, psandoz, chegar
 2015-10-13 16:15:06 -07:00
Doug Lea
cf43156eed 8134851: Integrate CompletableFuture with API enhancements 
8039378: CompletableFuture: Avoid StackOverflowError for long linear chains

Reviewed-by: martin, psandoz, chegar
 2015-10-13 16:04:56 -07:00
Phil Race
0d765d8e4c Merge 2015-10-12 14:41:36 -07:00
Daniel Fuchs
bd69fa0635 8033661: readConfiguration does not cleanly reinitialize the logging system 
Two new updateConfiguration methods have been added to LogManager: call updateConfiguration to update a configuration *after* the LogManager is initialized.

Reviewed-by: mchung
 2015-10-12 20:13:22 +02:00
Sergey Bylokhov
f07facd339 8136858: Examine the usage of ThreadGroup.stop() in sun.awt.AppContext 
Reviewed-by: alexsch, chegar
 2015-10-12 16:26:58 +03:00
Prasanta Sadhukhan
279a05d2b2 8072682: getBounds call on graphics.getDeviceConfiguration() returning cached information 
Reviewed-by: serb, flar
 2015-10-12 15:28:03 +03:00
Amy Lu
b14bbfc3da 8139407: Mark java/rmi/registry/readTest/readTest.sh as intermittently failing 
Reviewed-by: chegar
 2015-10-12 17:07:40 +08:00
Weijun Wang
4768e44b34 8085904: Test timeout on Mac 
Reviewed-by: wetmore
 2015-10-09 09:33:54 +08:00
Lance Andersen
dbf26ce3d5 8139056: Add convenience methods to Statement.java 
Reviewed-by: joehw, rriggs
 2015-10-22 11:36:17 -04:00
Chris Hegarty
6a0a6eb7be 8139352: java/net/InetAddress/getOriginalHostName.java fails to compile 
Reviewed-by: mchung, henryjen
 2015-10-12 10:33:51 +01:00
Paul Sandoz
25c1cff728 8135248: Add utility methods to check indexes and ranges 
Reviewed-by: forax, chegar, scolebourne, jrose, darcy
 2015-10-07 15:22:43 +02:00
Joe Darcy
f674b491a6 8138823: Correct bug in port of fdlibm hypot to Java 
Reviewed-by: bpb
 2015-10-06 18:39:26 -07:00
David Dehaven
0dfc929625 Merge 2015-10-06 12:51:55 -07:00
Paul Sandoz
5ba6e8e439 8133348: Reference.reachabilityFence 
Co-authored-by: Doug Lea <dl@cs.oswego.edu>
Co-authored-by: Aleksey Shipilev <aleksey.shipilev@oracle.com>
Reviewed-by: plevart, mr, chegar, mchung
 2015-10-06 18:42:06 +02:00
Iris Clark
3e5db5fac5 Merge 2015-10-05 20:55:53 -07:00
David Dehaven
1d92a8874c Merge 2015-10-05 13:45:50 -07:00
Naoto Sato
f8dca18a53 8138613: Remove SPI locale provider adapter from the default provider list 
Reviewed-by: okutsu
 2015-10-05 08:16:11 -07:00
Prasanta Sadhukhan
13ee9e097f 8132985: Crash in freetypescaler.c due to double free 
Reviewed-by: prr, simonis
 2015-10-05 15:36:43 +03:00
Semyon Sadetsky
4a3dff3ee5 8079595: Resizing dialog which is JWindow parent makes JVM crash 
Reviewed-by: alexsch, serb
 2015-10-05 15:29:23 +03:00
Masayoshi Okutsu
ff7c1c3bca 8138663: Missing @build in test/java/text/Format/DecimalFormat/RoundingAndPropertyTest.java 
Reviewed-by: naoto
 2015-10-02 13:21:46 +09:00
Ambarish Rapte
6a2fabcbd7 8040322: TextArea.replaceRange() and insert() are broken with setText(null) 
Reviewed-by: serb, azvegint
 2015-09-30 17:46:11 +04:00
Iris Clark
d0bbb6c588 Merge 2015-09-29 11:46:31 -07:00
Alexander Scherbatiy
53ab9a2026 8134917: [macosx] JOptionPane doesn't receive mouse events when opened from a drop event 
Reviewed-by: serb
 2015-09-29 15:19:52 +04:00
David Dehaven
5636c168b4 Merge 2015-09-28 08:14:42 -07:00
Amy Lu
25a239c820 8137232: Mark 3 more core-libs tests as intermittently failing 
Reviewed-by: chegar
 2015-09-28 16:39:12 +03:00
Chris Hegarty
0cc24c29ca 8137056: Move SharedSecrets and interface friends out of sun.misc 
Reviewed-by: alanb, mchung, psandoz, rriggs
 2015-09-28 13:39:27 +01:00
Amanda Jiang
8fb17dea79 8050402: Tests to check for use of policy files 
Reviewed-by: mullan
 2015-09-26 12:08:55 +03:00
Ivan Gerasimov
1613e728cc 8137121: (fc) Infinite loop FileChannel.truncate 
Reviewed-by: alanb
 2015-09-26 00:23:15 +03:00
Naoto Sato
a463c1a271 8136518: java/util/TimeZone/CLDRDisplayNamesTest.java fails for de 
Reviewed-by: okutsu
 2015-09-24 09:05:24 -07:00
Joe Darcy
47814c8df0 7130085: Port fdlibm hypot to Java 
Reviewed-by: bpb
 2015-09-23 14:14:14 -07:00
Roger Riggs
4e7617c040 8132541: (process) ProcessBuilder support for redirection to discard output 
Add redirect to NUL or /dev/null depending on the OS

Reviewed-by: chegar, martin
 2015-09-23 11:18:34 -04:00
Alejandro Murillo
9b6068f1cd Merge 2015-11-02 10:47:29 -08:00
Naoto Sato
5710e3c754 8062006: Add a new locale data name "COMPAT" for java.locale.providers system property to reduce ambiguity 
Reviewed-by: okutsu
 2015-11-02 08:46:19 -08:00
Alejandro Murillo
ed550bb440 Merge 2015-10-30 12:03:09 -07:00
Dean Long
19aba3bac9 Merge 2015-10-27 01:45:03 -04:00
Vladimir Ivanov
317553031c 8139881: Exclude java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java from execution 
Reviewed-by: kvn
 2015-10-19 17:52:39 +03:00
Michael Haupt
f1f609ddaa 8136931: more fine-grained condition checking for BMH species creation 
Reviewed-by: psandoz, sundar
 2015-09-23 08:43:51 +02:00
Naveen Kumar
aef9a19da8 8081794: ParsePosition getErrorIndex returns 0 for TimeZone parsing problem 
Reviewed-by: peytoia, okutsu
 2015-10-01 15:16:35 +09:00
Rob McKenna
ddf365ac99 8135305: InetAddress.isReachable reports true when loopback interface is specified 
Reviewed-by: michaelm
 2015-10-01 00:09:51 +01:00
Joe Darcy
112eb7283e 8136874: Bug in port of fdlibm pow to Java 
Reviewed-by: bpb
 2015-09-30 15:25:29 -07:00
Roger Riggs
eda52119fb 8137313: TreeTest.java intermittently fails with a timeout 
Enhance debugging information

Reviewed-by: chegar, darcy
 2015-09-30 12:33:08 -04:00
Daniel Fuchs
95b5f4d550 8137289: java/util/logging/DrainFindDeadlockTest.java hangs 
Removed timeout=10 from @run command line. added new debug traces.

Reviewed-by: chegar, mchung
 2015-09-30 11:17:32 +02:00
Ivan Gerasimov
f3e4326747 8137230: TEST_BUG: java/nio/channels/FileChannel/LoopingTruncate.java timed out 
Reviewed-by: rriggs
 2015-09-29 17:26:14 +03:00
Alexander Scherbatiy
2c3b2dd68e 8133453: Deprecate AWTKeyStroke.registerSubclass(Class) method 
Reviewed-by: serb, azvegint
 2015-09-22 14:05:37 +04:00
Iris Clark
01c0b611a3 Merge 2015-09-21 21:40:23 -07:00
Tagir Valeev
94ba18f8b4 8136686: Collectors.counting can use Collectors.summingLong to reduce boxing 
Reviewed-by: psandoz
 2015-09-19 15:26:34 +02:00
Phil Race
68a1bc4701 Merge 2015-09-18 11:31:15 -07:00
Phil Race
c79e901452 Merge 2015-09-18 11:24:54 -07:00
Vinnie Ryan
5d5ef39f51 8136534: Loading JKS keystore using non-null InputStream results in closed stream 
Reviewed-by: mullan, wetmore
 2015-09-18 17:54:28 +01:00
Phil Race
ec5f966a54 Merge 2015-09-18 09:18:17 -07:00
Roger Riggs
9d5cbc5fbc 8132735: java/lang/ProcessHandle/TreeTest failed with java.lang.AssertionError: Start with zero children 
Revise test to only operate on processes it spawns

Reviewed-by: chegar
 2015-09-17 22:46:04 -04:00
Roger Riggs
0d17c738d7 Merge 2015-09-17 22:46:02 -04:00
Joe Darcy
67603e6d54 8134795: Port fdlibm pow to Java 
Reviewed-by: bpb
 2015-09-17 13:43:06 -07:00
Roger Riggs
6eb869c3d6 Merge 2015-09-17 13:33:33 -04:00
Stuart Marks
343e882e7f 8072722: add stream support to Scanner 
Reviewed-by: psandoz, chegar, sherman
 2015-09-16 16:24:35 -07:00
Semyon Sadetsky
450cdf7f65 8131670: [TEST_BUG]Test java/awt/EventQueue/6980209/bug6980209.java fails on Linux 
Reviewed-by: alexsch, serb
 2015-09-16 10:32:46 +03:00
Semyon Sadetsky
ffb466574f 8014725: closed/java/awt/Clipboard/HTMLTransferTest/HTMLTransferTest.html failed intermittently 
Reviewed-by: alexsch, azvegint
 2015-09-16 10:22:42 +03:00
Martin Buchholz
a2f0fe3c94 8136583: Core libraries should use blessed modifier order 
Run blessed-modifier-order script (see bug)

Reviewed-by: psandoz, chegar, alanb, plevart
 2015-09-15 21:56:04 -07:00
Roger Riggs
1b8b6a4655 8133528: java/lang/ProcessHandle/OnExitTest.java fails intermittently 
Remove checks for processes not spawned by the test

Reviewed-by: joehw
 2015-09-15 22:11:00 -04:00
Alexander Scherbatiy
e643aeb178 8029339: Custom MultiResolution image support on HiDPI displays 
Reviewed-by: flar, serb
 2015-09-15 15:31:34 +04:00
Frank Yuan
371edc6684 8074931: Additional tests for CertPath API 
Reviewed-by: mullan
 2015-09-15 12:43:12 +03:00
Iris Clark
2bfa80503f Merge 2015-09-14 10:00:25 -07:00
Artem Smotrakov
f1f48ab0d3 8134232: KeyStore.load() throws an IOException with a wrong cause in case of wrong password 
Reviewed-by: vinnie
 2015-09-14 19:49:28 +03:00
Phil Race
e1ca4d3a94 Merge 2015-09-14 09:40:24 -07:00
Ambarish Rapte
b6f5a1c457 8039467: [TEST_BUG] Test java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java lefts keystrokes in a keyboard buffer on Windows 
Reviewed-by: serb, alexsch
 2015-09-14 18:54:04 +04:00
Pooja Chopra
da688f57c3 8136354: [TEST_BUG] Test java/awt/image/RescaleOp/RescaleAlphaTest.java with Bad action for script 
Reviewed-by: azvegint, serb
 2015-09-11 17:58:31 +03:00
Roger Riggs
ed3d59c71a 8133552: java/lang/ProcessHandle/InfoTest.java fails intermittently - incorrect user 
8133809: Remove java/lang/ProcessHandle/InfoTest.java from the Problem List

Reviewed-by: darcy, chegar, simonis
 2015-09-11 09:25:15 -04:00
Roger Riggs
aeb4acfb60 8135094: (process) java/lang/ProcessHandle/InfoTest fails testing commandLine() 
Reviewed-by: chegar, simonis
 2015-09-09 16:12:55 -04:00
Anton Nashatyrev
cb34d07ae1 8081485: EDT auto shutdown is broken in case of new event queue usage 
Reviewed-by: serb, alexp
 2015-09-09 19:10:38 +03:00
Ivan Gerasimov
50aa8839d5 8072466: Deadlock when initializing MulticastSocket and DatagramSocket 
Reviewed-by: chegar
 2015-09-09 16:33:19 +03:00
David Holmes
f032aa1311 8133611: Remove java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java from problem list 
Reviewed-by: darcy
 2015-09-09 04:02:59 -04:00
Phil Race
f39c6aeb63 Merge 2015-09-08 14:40:44 -07:00
Phil Race
d69a0641fd Merge 2015-09-08 11:47:07 -07:00
Iris Clark
9e0d78c661 Merge 2015-09-08 10:25:11 -07:00
Chris Hegarty
9ce7c19d86 8135043: ObjectStreamClass.getField(String) too restrictive 
Reviewed-by: igerasim
 2015-09-08 12:40:57 +01:00
Renjith Alexander
4130b71ce6 8133027: [Jigsaw] Test java/awt/PrintJob/Text/stringwidth.sh fails during compilation 
Reviewed-by: yan, serb
 2015-09-08 11:28:16 +03:00
Sergey Bylokhov
6fe3341869 8060027: Tests java/beans/XMLEncoder/Test4903007.java and java/beans/XMLEncoder/java_awt_GridBagLayout.java 
Reviewed-by: alexsch
 2015-09-07 23:29:56 +03:00
Renjith Alexander
dc25f76093 8133539: [TEST_BUG] Split java/awt/image/MultiResolutionImageTest.java in two to allow restricted access 
Reviewed-by: alexsch, serb
 2015-09-07 13:48:24 +03:00
Brian Burkhalter
005143e035 8135091: (fs) java/nio/file/Files/StreamLinesTest.java should test empty files 
In lines() add zero length case and rearrange first loop to avoid duplicate cases.

Reviewed-by: rriggs
 2015-09-04 14:16:34 -07:00
Sergey Bylokhov
1efc947d2a 8080948: [TEST_BUG] Few test cases are failing due to use of getPeer() 
Reviewed-by: prr, yan, alexsch
 2015-09-03 19:19:15 +03:00
Martin Buchholz
24742f7b1d 8134984: Text files should end in exactly one newline 
Automated fixup of newlines at end-of-file via the usual perl one-liner

Reviewed-by: chegar, sherman
 2015-09-02 14:11:50 -07:00
Sean Coffey
6a867ae5df 8133196: HTTPS hostname invalid issue with InetAddress 
Reviewed-by: chegar, xuelei
 2015-09-01 18:12:07 +01:00
Renjith Alexander
abdaade63f 8132376: Add @requires os.family to the client tests with access to internal OS-specific API 
Reviewed-by: yan, alexsch
 2015-09-01 11:03:43 +03:00
Phil Race
4abc68cead Merge 2015-08-31 11:29:55 -07:00
Brian Burkhalter
44c462ee50 8133987: (fs) Rename GnomeFileTypeDetector to GioFileTypeDetector 
Rename class and associated native file as indicated and fix some related comments in the source and test.

Reviewed-by: alanb
 2015-08-28 10:46:43 -07:00
Peter Brunet
1dbf8f4761 8134456: jdk/test/java/lang/SecurityManager/CheckPackageAccess.java failing on several platforms 
Add new restricted packages to the test code

Reviewed-by: mullan, mchung
 2015-08-27 22:35:24 -05:00
David Dehaven
7436faa3d1 Merge 2015-08-26 09:07:21 -07:00
Sergey Bylokhov
66ae036b1f 8047226: closed/java/awt/Component/GetScreenLocTest/GetScreenLocTest.html clicks on Unity's tool bar 
Reviewed-by: azvegint, alexsch
 2015-08-26 18:03:21 +03:00
Iris Clark
7c55ca4ce4 Merge 2015-08-25 14:45:26 -07:00
David Dehaven
5fe6ba60cb Merge 2015-08-25 14:32:08 -07:00
David Dehaven
eedfee9bfa Merge 2015-08-25 12:19:46 -07:00
Rob McKenna
9835141429 8087190: Regression in sun.net.util.IPAddressUtil.isIPv4LiteralAddress(String) 
Reviewed-by: chegar
 2015-08-25 14:07:08 +01:00
Vinnie Ryan
79e58cc0e5 8132786: java/security/cert/CertPathValidator/OCSP/AIACheck.java fails intermittently 
Reviewed-by: mullan
 2015-08-24 16:22:37 +01:00
Joel Borggrén-Franck
b7e143e8f6 8073056: Repeating annotations throws java.security.AccessControlException with a SecurityManager 
Reviewed-by: ahgross, darcy
 2015-08-24 11:00:12 +02:00
Sergey Bylokhov
7e07b0d76f 8077270: Missed test data in the test on java.beans.BeanProperty 
Reviewed-by: alexsch
 2015-08-20 13:46:16 +03:00
Alexander Scherbatiy
3b888867cb 8131339: [macosx] setMaximizedBounds() doesn't work for undecorated Frame 
Reviewed-by: serb
 2015-08-19 09:54:15 +04:00
Mandy Chung
f32b9d1944 8132944: test java/lang/ClassLoader/GetSystemPackage.java writes stuff to Agent stdout 
Reviewed-by: dholmes
 2015-08-18 20:30:15 -07:00
Joe Darcy
71cc6f510a 8133808: Place java/lang/ProcessHandle/InfoTest.java on the Problem List 
Reviewed-by: lancea
 2015-08-18 12:49:00 -07:00
Iris Clark
8db18e0442 Merge 2015-08-17 13:02:48 -07:00
Alejandro Murillo
64e18f581d Merge 2015-08-17 11:18:31 -07:00
David Dehaven
75e42535c3 Merge 2015-08-17 10:12:16 -07:00
Sergey Bylokhov
894f976f30 6778087: getLocationOnScreen() always returns (0, 0) for mouse wheel events 
Reviewed-by: alexsch, azvegint
 2015-08-17 16:56:22 +03:00
Konstantin Shefov
5e34f12e24 8060717: [TESTBUG] Improve test coverage of MethodHandles.explicitCastArguments() 
Reviewed-by: vlivanov, mhaupt
 2015-08-17 12:21:34 +03:00
Konstantin Shefov
20d0bb4d38 8133543: [TESTBUG] java/lang/invoke/LFCaching/LFSingleThreadCachingTest.java should be modified 
Reviewed-by: vlivanov, mhaupt
 2015-08-17 12:13:18 +03:00
Xueming Shen
bef17a6e80 8039390: Unexpected behaviour of String.format with null arguments 
To explicitly specify the null behavior for all conversions

Reviewed-by: rriggs
 2015-08-15 04:38:51 +00:00
Volker Simonis
1b8b82463e 8131168: Refactor ProcessHandleImpl_*.c and add implememtation for AIX 
Reviewed-by: rriggs, smarks
 2015-08-14 10:35:45 +02:00
Alejandro Murillo
d8f13cb1d1 Merge 2015-08-13 15:50:52 -07:00
Brian Burkhalter
5924c95500 8132539: (fs) Files.lines(path).collect() returns wrong value in JDK 9 with certain files 
Do not use the Spliterator approach for lines() if the FileChannel size is thought to be zero.

Reviewed-by: chegar
 2015-08-12 07:55:24 -07:00
David Dehaven
0cf20fdd7b Merge 2015-08-11 12:32:10 -07:00
Iris Clark
7546fcdcc8 Merge 2015-08-10 19:59:08 -07:00
Alejandro Murillo
29ad7ba848 Merge 2015-08-10 18:58:25 -07:00
Brian Burkhalter
eb79060337 8133287: (fs) java/nio/file/Files/probeContentType/ParallelProbes.java should use othervm mode 
Add @build tag containing ParallelProbes and SimpleFileTypeDetector and reinstate othervm mode.

Reviewed-by: darcy
 2015-08-10 17:26:55 -07:00
Joe Darcy
c32cc2b967 8133231: Mark TimeoutLockLoops.java as failing intermittently 
Reviewed-by: lancea
 2015-08-10 16:28:31 -07:00
Brian Burkhalter
aabba04bda 8132497: (fs) FileSystems.newFileSystem(URI, ..) doesn't handle UOE thrown by provider 
Handle UOEs in newFileSystem(URI,...) similarly to as done in newFileSystem(Path path, ClassLoader loader).

Reviewed-by: chegar
 2015-08-10 10:50:24 -07:00
Dmitry Samersoff
c23132013d Merge 2015-08-10 14:05:37 +03:00
Brian Burkhalter
e0803f5e68 8133207: ParallelProbes.java test fails after changes for JDK-8080115 
Do not run in othervm mode.

Reviewed-by: darcy, rriggs
 2015-08-07 16:09:10 -07:00
Brian Burkhalter
f0c2f24793 8080115: (fs) Crash in libgio when calling Files.probeContentType(path) from parallel threads 
Make GnomeFileTypeDetector.probeGio() synchronized and add a regression test based on the test source included in JDK-8080115.

Reviewed-by: chegar
 2015-08-07 07:10:44 -07:00
Naoto Sato
b9a10bbf8d 8133044: [TESTBUG] CLDRDisplayNameTest uses deprecated API, fails 
Reviewed-by: okutsu
 2015-08-06 18:20:11 -07:00
Alejandro Murillo
aa37ecbc21 Merge 2015-08-06 13:00:45 -07:00
Brian Burkhalter
ba6e733ede 8129633: (fs) Investigate removing the GNOME-based FileTypeDetector from the Linux and Solaris implementations 
Remove the GNOME VFS detector leaving the libgio detector in place.

Reviewed-by: chegar
 2015-08-06 12:35:59 -07:00
Roger Riggs
e2f7de320c 8133022: Instant.toEpochMilli() silently overflows 
Reviewed-by: lancea, chegar, simonis, dfuchs, igerasim
 2015-08-06 14:35:04 -04:00
Sergey Bylokhov
c595f6461c 4379403: Need to disable the "magic AWT dump key" (CTRL+SHIFT+F1) 
Reviewed-by: alexsch, azvegint
 2015-08-06 19:52:02 +03:00
Mikhail Cherkasov
5896a1bf4a 8081787: [macosx] MalformedURLException is thrown during reading data for application/x-java-url;class=java.net.URL flavor 
Reviewed-by: alexsch, serb
 2015-08-13 15:29:03 +03:00
Yuri Nesterenko
565373e1bc 8132958: [TEST_BUG] Part 1: update client tests failing after changes in setAccessible(true) routine 
Reviewed-by: alexsch, serb
 2015-08-13 14:20:36 +03:00
David Dehaven
d3d5d40154 Merge 2015-08-12 09:36:43 -07:00
Alexander Zvegintsev
23438be9c4 8014212: Robot captures black screen 
Reviewed-by: alexsch, serb
 2015-08-11 16:32:13 +03:00
Daniel Fuchs
6af81451d1 8132550: java/util/logging/LoggingDeadlock2.java times out 
LogManager must also use the configurationLock when reading its primordial configuration.

Reviewed-by: joehw
 2015-08-06 16:36:47 +02:00
Prasanta Sadhukhan
924b4ad5ff 8080287: The image of BufferedImage.TYPE_INT_ARGB and BufferedImage.TYPE_INT_ARGB_PRE is blank 
Reviewed-by: prr, flar
 2015-08-06 11:36:52 +03:00
Jamil Nimeh
e7f31340a0 8046321: OCSP Stapling for TLS 
Initial feature commit for OCSP stapling in JSSE

Reviewed-by: xuelei, mullan
 2015-08-05 12:19:38 -07:00
Alexander Stepanov
fed9b961cb 8132566: [TESTBUG] add regression test for inherited classes with the new bean annotations 
Reviewed-by: alexsch
 2015-08-05 19:11:27 +03:00
Kim Barrett
8bfa163a68 8132306: java/lang/ref/ReferenceEnqueue.java fails with "RuntimeException: Error: poll() returned null; expected ref object" 
Carefully order ref.queue and queue list updates to address races.

Reviewed-by: dholmes, dfuchs, plevart
 2015-08-04 17:26:14 -04:00
David Dehaven
1942bcfa90 Merge 2015-08-04 11:31:19 -07:00
Alejandro Murillo
5a76b5c4e6 Merge 2015-08-04 10:59:31 -07:00
Alexander Stepanov
de09603863 8131055: bean annotations: add a test checking if a user-defined BeanInfo is top-priority as compared with the annotations 
Reviewed-by: alexsch, serb
 2015-08-04 14:03:49 +03:00
Alexander Zvegintsev
861ba88c86 8130400: Test java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java fails with ClassCastException 
Reviewed-by: prr, serb
 2015-08-04 12:34:08 +03:00
Naoto Sato
9166dacb21 8129881: JDK-8008577 breaks Nashorn test 
8130845: Change to CLDR Locale data in JDK 9 b71 causes SimpleDateFormat parsing errors
8132125: German (Switzerland) formatting broken if CLDR Locale Data is used

Reviewed-by: tbell, okutsu
 2015-08-03 21:47:50 -07:00
David Dehaven
726f626bd7 Merge 2015-08-03 16:33:06 -07:00
Iris Clark
959eee3901 Merge 2015-08-03 09:26:18 -07:00
Olivier Lagneau
e4c4b49bdf 8130339: Add tracing info to LowMemoryTest.java to help 8130339 diagnosis 
Run test with traces even when timeout occurs.

Reviewed-by: jbachorik, sspitsyn
 2015-08-03 15:31:29 +02:00
Jiangli Zhou
47e90bb79c Merge 2015-07-31 16:00:29 -04:00
Alejandro Murillo
972e5ce0a3 Merge 2015-07-31 10:15:03 -07:00
Brian Burkhalter
8c92994887 8132795: Bug ID accidentally omitted from top level regression test in fix for JDK-8065556 
Add 8065556 to list of IDs in the @bug tag list.

Reviewed-by: alanb
 2015-07-31 07:48:34 -07:00
Brian Burkhalter
8a369f2f2c 8073078: java/nio/file/FileStore/Basic.java sensitive to NFS configuration 
Ignore NoSuchFileExceptions as the store might have been deleted subsequent to creation of the FileStore iterator which is not dynamic.

Reviewed-by: alanb
 2015-07-31 07:15:59 -07:00
Vinnie Ryan
c1cd222df9 8130850: Support loading a keystore with a custom KeyStore.LoadStoreParameter class 
Reviewed-by: mullan
 2015-07-31 14:29:25 +01:00
Yuri Nesterenko
791267a096 6544871: java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html fails from jdk b09 on windows 
Reviewed-by: serb
 2015-07-31 13:13:30 +03:00
Stuart Marks
791c9bdc4d 8132745: minor cleanup of java/util/Scanner/ScanTest.java 
Reviewed-by: darcy, sherman
 2015-07-30 22:21:56 -07:00
Dmitry Samersoff
47bdec1c0e 8059036: Implement Diagnostic Commands for heap and finalizerinfo 
Implement Diagnostic Commands for heap and finalizerinfo

Reviewed-by: sla, plevart, mchung
 2015-07-30 16:29:13 +03:00
Alexander Scherbatiy
dfc226cfb6 8132123: MultiResolutionCachedImage unnecessarily creates base image to get its size 
Reviewed-by: serb
 2015-07-30 12:40:45 +04:00
Dmitry Cherepanov
85c4b3c082 Merge 2015-07-29 11:33:02 +04:00
Dmitry Cherepanov
9fb2a2c094 Merge 2015-07-29 09:47:54 +04:00
Semyon Sadetsky
17903d1583 8025815: Child FileDialog of modal dialog does not get focus on Gnome 
Reviewed-by: azvegint, serb
 2015-07-28 20:55:45 +03:00
Volker Simonis
29a79fc1a3 8132374: AIX: fix value of os.version property 
Reviewed-by: alanb, rriggs
 2015-07-27 19:50:14 +02:00
Brian Burkhalter
7cd090f230 8065556: (bf) Buffer.position and other methods should include detail in IAE 
Add messages to IAEs which have none.

Reviewed-by: alanb
 2015-07-24 11:52:30 -07:00
Jaroslav Bachorik
aa572f2749 Merge 2015-07-24 20:45:30 +02:00
Iris Clark
636d3c2d95 Merge 2015-07-23 13:19:54 -07:00
Konstantin Shefov
fdc7b2e85f 8130006: java/lang/invoke/MethodHandles/CatchExceptionTest Fails 
Reviewed-by: psandoz
 2015-07-23 16:46:54 +03:00
Xueming Shen
3d82fdcaad 8130914: java/util/zip/TestExtraTime.java fails with "java.lang.RuntimeException: setTime should make getLastModifiedTime return the specified instant: 3078282244456 got: 3078282244455" 
Fixed the 32-bit overflow.

Reviewed-by: rriggs
 2015-07-22 21:11:38 -07:00
Yong Jeffrey Huang
7e1ed8f785 8129361: ISO 4217 amendment 160 
Reviewed-by: naoto
 2015-07-29 23:36:51 -07:00
Stuart Marks
572e30db49 8132206: move ScanTest.java into OpenJDK 
Reviewed-by: psandoz, sherman
 2015-07-29 15:21:12 -07:00
Naoto Sato
0dfdc19faa 8027607: (rb) Provide UTF-8 based properties resource bundles 
Reviewed-by: okutsu, sherman
 2015-07-29 13:36:53 -07:00
Xueming Shen
47dbbc7b72 8075526: Need a way to read and write ZipEntry timestamp using local date/time without tz conversion 
To add a pair of set/getTimeLocal()

Reviewed-by: ksrini, rriggs
 2015-07-22 21:43:33 +00:00
Katja Kantserova
b66a26f3b1 8132094: Mark intermittently failuring core-svc tests 
Reviewed-by: jbachorik, sspitsyn
 2015-07-22 09:51:40 +02:00
Jaroslav Bachorik
d5644aff56 8132059: com/sun/jdi/BreakpointTest.java fails with java.lang.IllegalArgumentException: Bad line number 
Reviewed-by: dcubed
 2015-07-21 18:38:09 +02:00
Tristan Yan
7f9414bc11 8068761: Test java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException 
Reviewed-by: rriggs
 2015-07-21 14:15:59 -04:00
Semyon Sadetsky
1564b678e7 8130390: Applet fails to launch on virtual desktop 
Reviewed-by: azvegint, serb
 2015-07-21 09:35:04 +03:00
Joe Darcy
6e48caf250 8081734: ConcurrentHashMap/ConcurrentAssociateTest.java, times out 90% of time on sparc with 256 cpu 
Reviewed-by: chegar
 2015-07-20 15:13:50 -07:00
Iris Clark
89a565ccd0 Merge 2015-07-20 11:01:24 -07:00
Iris Clark
3542628ec7 8130696: Security Providers need to have their version numbers updated for JDK 9 
Reviewed-by: ascarpino, mullan, valeriep, weijun, wetmore
 2015-07-20 09:40:49 -07:00
Sean Mullan
981dbca21a 8131486: SecureClassLoader key for ProtectionDomain cache also needs to take into account certificates 
Reviewed-by: weijun
 2015-07-20 09:03:03 -04:00
Katja Kantserova
29a5a845e9 8075658: Mark intermittently failuring core-svc tests 
Reviewed-by: jbachorik, olagneau, darcy
 2015-07-20 13:14:47 +02:00
Dmitry Cherepanov
5cea10f338 Merge 2015-07-20 10:21:01 +04:00
Sergey Bylokhov
8e0627b61b 8066404: The case is failed automatically and thrown the "java.lang.IllegalStateException" exception 
Reviewed-by: alexsch
 2015-07-18 15:10:44 +03:00
Sergey Bylokhov
e8292406d9 8130937: Several methods in BeanProperty return null instead of boolean value 
Reviewed-by: alexsch
 2015-07-18 15:09:28 +03:00
Yuri Nesterenko
7b228fdfec 8131673: [TEST_BUG] add @modules to some OS X-specific regtests 
Reviewed-by: serb, azvegint
 2015-07-17 11:45:34 +03:00
Amy Lu
1aa0bf7daf 8131140: Mark some tests from WhileOpStatefulTest.java and WhileOpTest.java as serialization hostile 
Reviewed-by: psandoz
 2015-07-16 10:21:21 +02:00
Brian Burkhalter
0ee4830a94 8065570: (bf spec) ByteBuffer.slice() should make it clear that the initial order is BIG_ENDIAN 
Refine documentation of allocate*(), wrap(), slice(), duplicate(), asReadOnlyBuffer(), and as{Type}Buffer() to explcitly state the byte order of the created buffer.

Reviewed-by: alanb
 2015-07-15 10:43:07 -07:00
Vinnie Ryan
44db4a2bcb 8131359: Correct the JTREG tags in java/security/KeyStore/PKCS12/MetadataStoreLoadTest.java test 
Reviewed-by: mullan
 2015-07-15 18:42:12 +01:00
David Dehaven
572a316307 Merge 2015-07-15 10:00:15 -07:00
Felix Yang
ea58ca6a25 8130394: DatagramChannel tests need to be hardended to ignore stray datagrams 
The patch updates tests to ignore stray datagrams, or at least print more information to ease troubleshooting.

Reviewed-by: rriggs
 2015-07-15 08:42:24 -07:00
Bhanu Prakash Gopularam
13a6fbe6c0 8048830: Implement tests for new functionality provided in JEP 166 
Reviewed-by: vinnie
 2015-07-15 15:07:58 +01:00
Pooja Chopra
a7e436f3df 8080953: [TEST_BUG]Test java/awt/FontClass/DebugFonts.java fails due to wrongly typed bugid 
Reviewed-by: azvegint, serb
 2015-07-15 14:05:09 +03:00
Pooja Chopra
515dca5c8b 8080932: [TEST_BUG] Test java/awt/BasicStroke/DashStrokeTest.java fails with Bad script error due to improper @run notation 
Reviewed-by: azvegint, alexsch
 2015-07-15 14:02:24 +03:00
Mandy Chung
8bc30fb3c8 8104574: Update tests to prepare for system class loader not be URLClassLoader 
Reviewed-by: chegar
 2015-07-15 12:10:03 +08:00
Roger Riggs
9bb445c368 Merge 2015-07-14 22:21:52 -04:00
Roger Riggs
e8d341671b 8130877: (process) java/lang/ProcessHandle/TreeTest test3 failure - Destroyed process.isAlive 
Update test to check for children after processes are destroyed

Reviewed-by: darcy
 2015-07-14 22:21:02 -04:00
Yuka Kamiya
64b36f8f63 8032446: Support Unicode 7.0.0 in JDK 9 
8130889: Missing "@since 1.8" tags in j.l.Character.java

Reviewed-by: naoto, okutsu
 2015-07-15 11:05:51 +09:00
Alejandro Murillo
1d7da049eb Merge 2015-07-14 16:29:08 -07:00
David Dehaven
267d60654e Merge 2015-07-14 15:18:26 -07:00
Ivan Gerasimov
9b9fde193f 6854417: TESTBUG: java/util/regex/RegExTest.java fails intermittently 
Reviewed-by: sherman
 2015-07-14 02:03:35 +03:00
Alejandro Murillo
867e029083 Merge 2015-07-09 22:46:18 -07:00
Rob McKenna
0f4fb659ea 8133015: InetAddress.isReachable(tmout) returning wrong value on Windows for IPv6 
Reviewed-by: michaelm
 2015-08-21 20:41:21 +01:00
David Dehaven
79324abda0 Merge 2015-07-07 12:26:59 -07:00
Daniel D. Daugherty
10219ee9a2 Merge 2015-07-03 07:13:24 -07:00
Sergey Bylokhov
ffbfb8f10b 7188942: Remove support of pbuffers in OGL Java2d pipeline 
Reviewed-by: prr, flar
 2015-07-03 16:39:45 +03:00
Yuri Nesterenko
a26c73956c 8130125: [TEST_BUG] add @modules to the several client tests unaffected by the automated bulk update 
Reviewed-by: serb, alexsch
 2015-07-03 17:37:40 +03:00
Artem Smotrakov
aa2d62b688 8129444: socksProxyVersion system property ignored for Socket(Proxy) 
Reviewed-by: chegar
 2015-07-03 08:00:33 +01:00
Daniel D. Daugherty
bee43f05d7 Merge 2015-07-02 14:39:54 -07:00
Phil Race
322bf5d364 Merge 2015-06-30 10:37:48 -07:00
Phil Race
d3ecdcca36 Merge 2015-06-30 08:51:16 -07:00
Stefan Sarne
32c0d8bc46 6896810: TEST_BUG: java/lang/ref/SoftReference/Pin.java fails with OOME during System.out.println 
Reviewed-by: stefank, dholmes, chegar, sjohanss
 2015-06-30 17:16:40 +02:00
Amy Lu
512986a71c 8129759: Mark two tests from DistinctOpTest.java and SliceOpTest.java as serialization hostile 
Reviewed-by: psandoz
 2015-06-30 10:00:46 +02:00
Martin Buchholz
57996d703c 6260652: (coll) Arrays.asList(x).toArray().getClass() should be Object[].class 
Return Arrays.copyOf(a, a.length, Object[].class)

Reviewed-by: igerasim, psandoz
 2015-06-29 15:02:35 -07:00
Roger Riggs
99f867bded 8098852: java/lang/ProcessHandle/InfoTest.java failed: total cpu time expected < 10s more 
Correct javachild to spin until cputime increases by amount; cleanup InfoTest

Reviewed-by: darcy
 2015-07-09 09:55:36 -04:00
Roger Riggs
74427b9101 8130296: [TESTBUG] java/lang/ProcessHandle/OnExitTest - Unaccounted for children expected [0] but found [1] 
Ignore extra processes that are not created by the test and cleanup any remaining child processes

Reviewed-by: darcy
 2015-07-08 21:54:32 -04:00
Daniel Fuchs
16318cebe6 8130649: java/util/logging/LoggingDeadlock2.java times out 
Added additional traces and thread dump diagnosis for the child process

Reviewed-by: lancea
 2015-07-08 11:58:14 +02:00
Roger Riggs
4b7514c9fd 8085981: java/lang/ProcessHandle/OnExitTest.java: AssertionError: Child onExit not called 
A race condition caused an erroneous fault

Reviewed-by: darcy
 2015-07-07 21:25:05 -04:00
Roger Riggs
21ed89bc5d 8085980: java/lang/ProcessHandle/TreeTest.java: AssertionError: Wrong number of spawned children expected [1] but found [2] 
Modify to expect only the spawned children; enhance debug output

Reviewed-by: darcy
 2015-07-07 16:54:52 -04:00
Brian Burkhalter
6d59eaa98c 8042983: test/java/math/BigInteger/ExtremeShiftingTests.java needs too much heap 
Use @requires tag to suppress the test on limited memory systems.

Reviewed-by: darcy
 2015-06-29 14:49:47 -07:00