127 Commits

Author SHA1 Message Date
Alan Bateman
fbe85300bf 8169069: Module system implementation refresh (11/2016)
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Reviewed-by: plevart, chegar, psandoz, mchung, alanb, dfuchs, naoto, coffeys, weijun
2016-12-01 08:57:53 +00:00
Daniel Fuchs
05be04a123 8152515: (logging) LogManager.resetLogger should ignore LinkageError
LogManager.resetLogger will also ignore errors, but only while shutting down.

Reviewed-by: rriggs, dholmes
2016-11-02 14:46:40 +00:00
Daniel Fuchs
aebe74d3f5 6543126: Level.known can leak memory
Custom level instances will now be released when their defining class loader is no longer referenced.

Reviewed-by: plevart, mchung, chegar
2016-09-14 14:04:14 +01:00
Sergei Kovalev
d0474e029b 8165583: Fix module dependencies for jdk/java/util/* tests
Reviewed-by: alanb
2016-09-08 09:59:54 -07:00
Alexandre Iline
3ff1d554b4 8164982: Fix legal notices in java/lang, java/net, java/util tests
Reviewed-by: darcy, iris
2016-08-31 09:46:50 -07:00
Mandy Chung
e2a0ff3e0d 8136930: Simplify use of module-system options by custom launchers
Reviewed-by: alanb, ksrini, henryjen, sundar
2016-08-10 15:51:25 -07:00
Daniel Fuchs
d5e84de014 8159245: Loggers created by system classes are not initialized correctly when configured programmatically from application code
Loggers of the same name now share the same configuration.

Reviewed-by: mchung, mli
2016-07-12 11:29:01 +01:00
Daniel Fuchs
1aceedb6a9 8056285: java/util/logging/CheckLockLocationTest.java java.lang.RuntimeException: Test failed: should have been able to create FileHandler for %t/writable-dir/log.log in writable directory
Added some instrumentation to the test to help a better diagnosis

Reviewed-by: mchung
2016-07-11 11:32:40 +01:00
Ramanand Patil
78f385b79a 8153955: increase java.util.logging.FileHandler MAX_LOCKS limit
This patch adds a new configurable property "java.util.logging.FileHandler.maxLocks" to java.util.logging.FileHandler which can be defined in the logging configuration file and makes it possible to configure the maximum number of concurrent log file locks a FileHandler can handle. If not overridden, the default value of maxLocks (100) remains unchanged.

Reviewed-by: dfuchs, coffeys
2016-06-27 11:52:49 +05:30
Daniel Fuchs
4c69f47805 8153666: Optimize Formatter.formatMessage
This patch brings a small optimization that removes needless synchronization in Formatter.formatMessage. It also fixes the code that decides whether to call MessageFormat, and brings a small clarification to the API documentation on the conditions when that will happen.

Reviewed-by: rriggs, martin
2016-06-13 08:20:34 +01:00
Daniel Fuchs
c3435ed005 8146389: java/util/logging/XMLFormatterDate.java fails during year switch
Updates the test to match the changes in the XML content that were brought by JDK-8072645.

Reviewed-by: joehw
2016-05-26 19:55:00 +02:00
Daniel Fuchs
9c83adecd5 8152436: Add a test to verify that the root logger correctly reports the caller's information
This test verifies that 8152389 does no longer occur in JDK 9 and upwards.

Reviewed-by: mchung, lancea
2016-04-06 17:54:41 +02:00
Alan Bateman
db4d383614 8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282

Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Alexandr Scherbatiy <alexandr.scherbatiy@oracle.com>
Co-authored-by: Amy Lu <amy.lu@oracle.com>
Co-authored-by: Calvin Cheung <calvin.cheung@oracle.com>
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Harold Seigel <harold.seigel@oracle.com>
Co-authored-by: Jaroslav Bachorik <jaroslav.bachorik@oracle.com>
Co-authored-by: Jean-Francois Denise <jean-francois.denise@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: James Laskey <james.laskey@oracle.com>
Co-authored-by: Lois Foltan <lois.foltan@oracle.com>
Co-authored-by: Miroslav Kos <miroslav.kos@oracle.com>
Co-authored-by: Huaming Li <huaming.li@oracle.com>
Co-authored-by: Sean Mullan <sean.mullan@oracle.com>
Co-authored-by: Naoto Sato <naoto.sato@oracle.com>
Co-authored-by: Masayoshi Okutsu <masayoshi.okutsu@oracle.com>
Co-authored-by: Peter Levart <peter.levart@gmail.com>
Co-authored-by: Philip Race <philip.race@oracle.com>
Co-authored-by: Claes Redestad <claes.redestad@oracle.com>
Co-authored-by: Sergey Bylokhov <sergey.bylokhov@oracle.com>
Co-authored-by: Alexandre Iline <alexandre.iline@oracle.com>
Co-authored-by: Volker Simonis <volker.simonis@gmail.com>
Co-authored-by: Staffan Larsen <staffan.larsen@oracle.com>
Co-authored-by: Stuart Marks <stuart.marks@oracle.com>
Co-authored-by: Semyon Sadetsky <semyon.sadetsky@oracle.com>
Co-authored-by: Serguei Spitsyn <serguei.spitsyn@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Co-authored-by: Valerie Peng <valerie.peng@oracle.com>
Co-authored-by: Vincent Ryan <vincent.x.ryan@oracle.com>
Co-authored-by: Weijun Wang <weijun.wang@oracle.com>
Co-authored-by: Yuri Nesterenko <yuri.nesterenko@oracle.com>
Co-authored-by: Yekaterina Kantserova <yekaterina.kantserova@oracle.com>
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Felix Yang <felix.yang@oracle.com>
Co-authored-by: Andrei Eremeev <andrei.eremeev@oracle.com>
Co-authored-by: Frank Yuan <frank.yuan@oracle.com>
Co-authored-by: Sergei Pikalev <sergei.pikalev@oracle.com>
Co-authored-by: Sibabrata Sahoo <sibabrata.sahoo@oracle.com>
Co-authored-by: Tiantian Du <tiantian.du@oracle.com>
Co-authored-by: Sha Jiang <sha.jiang@oracle.com>
Reviewed-by: alanb, mchung, naoto, rriggs, psandoz, plevart, mullan, ascarpino, vinnie, prr, sherman, dfuchs, mhaupt
2016-03-17 19:04:16 +00:00
Daniel Fuchs
ae7478607a 8150533: Test java/util/logging/LogManagerAppContextDeadlock.java times out intermittently
This is a test bug caused by a Logger being garbage collected too early.

Reviewed-by: darcy
2016-02-26 12:11:28 +01:00
Alexandre Iline
451a576a42 8149391: Fix module dependences in java/util tests
Reviewed-by: mchung
2016-02-08 18:14:48 -08:00
Daniel Fuchs
55a9500797 8146665: Test jdk/test/java/util/logging/LogManager/Configuration/updateConfiguration/UpdateConfigurationTest.java fails - missing expected output
Increases numbers of gc loops and fix finally {} clause to get a better diagnostic

Reviewed-by: mchung
2016-01-11 18:30:14 +01:00
Daniel Fuchs
66f1f09adb 8144262: LogRecord.getMillis() method is a convenience API that should not have been deprecated
LogRecord.getMillis() is no longer deprecated. LogRecord.setInstant() check that the instant millis can fit in a long millisecond-since-epoch.

Reviewed-by: lancea, rriggs, smarks
2015-12-07 12:35:37 +01:00
Alexandre Iline
fb7027bca9 8139430: Refactor test library to decrease module dependencies of tests
Reviewed-by: mchung, alanb
2015-11-23 11:49:04 -08:00
Daniel Fuchs
bd8942b7a1 8140364: JEP 264 Platform Logger API and Service Implementation
Initial implementation for JEP 264 Platform Logger API and Service

Reviewed-by: mchung, psandoz, rriggs
2015-11-20 19:26:16 +01: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
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
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
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
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
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
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
Mandy Chung
53a97cbeb3 8081347: Add @modules to jdk_core tests
Co-authored-by: Alexander Kulyakthin <alexander.kulyakhtin@oracle.com>
Co-authored-by: Alan Bateman <alan.bateman@oracle.com>
Reviewed-by: alanb, joehw, lancea
2015-05-28 10:54:48 -07:00
Peter Levart
30bcd97f81 8077846: improve locking strategy for readConfiguration(), reset(), and initializeGlobalHandlers()
Co-authored-by: Daniel Fuchs <daniel.fuchs@oracle.com>
Reviewed-by: dholmes, alanb, mchung
2015-05-17 10:38:36 +02:00
Daniel Fuchs
04f236baec 8079773: java/util/logging/LogManager/TestLoggerNames.java
Fixed a race condition in the test which was responsible of the intermittent failure.

Reviewed-by: mchung
2015-05-12 14:32:50 +02:00
Joe Darcy
86c109e149 8078334: Mark regression tests using randomness
Reviewed-by: xuelei, alanb
2015-04-29 10:25:53 -07:00
Daniel Fuchs
ce950c0798 7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
NamedLoggers is now a ConcurrentHashMap. findLogger is updated to take benefit of the change.

Co-authored-by: Peter Levart <peter.levart@gmail.com>
Reviewed-by: dholmes, lancea, martin, mchung, plevart
2015-04-02 16:24:46 +02:00
Daniel Fuchs
679db144e5 8075810: LogManager.readConfiguration may throw undocumented IllegalArgumentException
LogManager.readConfiguration will wrap the IllegalArgumentException thrown by Properties.load inside an IOException.

Reviewed-by: lancea, mchung, rriggs
2015-04-02 11:42:07 +02:00
Daniel Fuchs
fc084beb84 8072645: java.util.logging should use java.time to get more precise time stamps
J.u.logging uses j.t.Instant to store LogRecord time stamps. XMLFormatter format is updated to allow for a new optional <nanos> element containing a nano second adjustment. SimpleFormatter passes a ZonedDateTime object to String.format. LogRecord getMillis/setMillis are deprecated, replaced by getInstant/setInstant.

Co-authored-by: Peter Levart <peter.levart@gmail.com>
Reviewed-by: scolebourne, plevart, rriggs
2015-02-25 18:41:07 +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
Daniel Fuchs
7e7e10eb42 8065991: LogManager unecessarily calls JavaAWTAccess from within a critical section
The call to JavaAWTAccess is moved outside of the critical section

Reviewed-by: mchung
2014-12-05 12:20:51 +01:00
Daniel Fuchs
96da5b9ce3 8060132: Handlers configured on abstract nodes in logging.properties are not always properly closed
Loggers which have been configured with a handler in the configuration file will be retained by the LogManager until reset() is called. A new configuration property is added to explicitely turn the fix off.

Reviewed-by: mchung
2014-11-24 17:02:37 +01:00
Daniel Fuchs
59ca72f0eb 8059767: FileHandler should allow 'long' limits and handle overflow of MeteredStream.written
FileHandler now uses 'long' for limit and MeteredStream.written. It also reads a long for limit from the configuration, and has a new constructor allowing to pass a 'long' for limit.

Reviewed-by: alanb, igerasim, mchung
2014-10-22 17:23:14 +02:00
Daniel Fuchs
9183fba213 8028788: Logger.enterring uses String concatenation in a loop
Changed code to use StringBuilder instead.

Reviewed-by: chegar, lancea
2014-10-07 14:49:45 +02:00
Daniel Fuchs
7200372290 8025690: Default FileHandler constructor doesn't throw NullPointerException if pattern is empty and count > 1
Added additional check in default constructor in order to fix the oddity and make the implementation comply with the spec.

Reviewed-by: lancea
2014-10-01 18:16:45 +02:00
Daniel Fuchs
9087c7536e 8059269: FileHandler may throw NPE if pattern is a simple name and the lock file already exists
NPE may be thrown when Path.getParentPath() returns null. The fix is to call Path.getAbsolutePath().getParentPath() when Path.getParentPath() returns null.

Reviewed-by: alanb
2014-09-29 18:56:32 +02:00
Daniel Fuchs
0a6f6d9d89 8043306: Provide a replacement for the API that allowed to listen for LogManager configuration changes
Added two new methods to LogManager (addConfigurationListener/removeConfigurationListener) which provide an equivalent functionality with no ties to java.beans.

Reviewed-by: alanb, mchung, plevart, psandoz
2014-09-26 11:29:29 +02:00
Daniel Fuchs
f0133ac1a0 8052403: java/util/logging/CheckZombieLockTest.java fails with NoSuchFileException
CheckZombieLockTest and CheckLockLocationTest should work with different temporary log directories so that they can be run concurrently. This fix changes the name of the log directory used by CheckZombieLockTest.

Reviewed-by: mchung
2014-08-19 17:11:28 +02:00
Daniel Fuchs
15a875a7a5 8054480: Test java/util/logging/TestLoggerBundleSync.java fails: Unexpected bundle name: null
This is due to a race condition in the test where one GetRB thread can receive a stale LogRecord comming from another GetRB thread.

Reviewed-by: dholmes
2014-08-14 15:18:11 +02:00
Daniel Fuchs
7c04b45666 8048913: java/util/logging/LoggingDeadlock2.java times out
Removes the /timeout=15 parameter from the @run command line

Reviewed-by: mchung, dholmes
2014-07-09 17:51:50 +02:00
Daniel Fuchs
44470419c0 8048020: Regression on java.util.logging.FileHandler
In some circumstances j.u.l.FileHandler can leave zombie lock files on the file system. The fix lets FileHandler reuse such zombie lock files when it sees them - as it used to do in version 1.7 of the JDK.

Reviewed-by: alanb
2014-07-07 15:31:07 +02:00
Lana Steuck
657b9db1ba 8029235: Update copyright year to match last edit in jdk8 jdk repository for 2013
Updated files with 2011, 2012 and 2013 years according to the file's last updated date

Reviewed-by: tbell, lancea, chegar
2013-12-26 12:04:16 -08:00
Daniel Fuchs
2f7d6e1157 8029876: Add a test to verify that Logger.getLogger & LogManager.getLogManager don't throw NPE when System.out == null
Adds a new test that verifies that the suspected root cause of JDK-8025512 does not cause NPE to be thrown.

Reviewed-by: mchung
2014-02-11 12:23:28 +01:00
Daniel Fuchs
11c56780a4 8033542: test/java/util/logging/SimpleLogManager might let Loggers be gc'ed too early
Fix another case of potentially premature Logger garbage collection in tests.

Reviewed-by: mchung
2014-02-05 17:56:04 +01:00
Vladimir Kozlov
57b7b831ae Merge 2014-01-28 14:57:41 -08:00
Vladimir Kozlov
9c83896027 Merge 2014-01-22 14:17:32 -08:00