diff options
| author | Jesse Wilson <jessewilson@google.com> | 2009-10-26 17:49:25 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2009-10-27 15:42:34 -0700 |
| commit | 6aeae90150e4c830c4a6e066a2b1912e9d828b87 (patch) | |
| tree | e04b410a46a9785e9725419fd785ea501b7cc757 /logging/src/main/java | |
| parent | d9179c4701153caeb821cf3da639b28465317508 (diff) | |
| download | libcore-6aeae90150e4c830c4a6e066a2b1912e9d828b87.zip libcore-6aeae90150e4c830c4a6e066a2b1912e9d828b87.tar.gz libcore-6aeae90150e4c830c4a6e066a2b1912e9d828b87.tar.bz2 | |
Update logging to r820767
Diffstat (limited to 'logging/src/main/java')
| -rw-r--r-- | logging/src/main/java/java/util/logging/FileHandler.java | 2 | ||||
| -rw-r--r-- | logging/src/main/java/java/util/logging/LogManager.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/logging/src/main/java/java/util/logging/FileHandler.java b/logging/src/main/java/java/util/logging/FileHandler.java index e1eba9e..dd7790e 100644 --- a/logging/src/main/java/java/util/logging/FileHandler.java +++ b/logging/src/main/java/java/util/logging/FileHandler.java @@ -571,7 +571,7 @@ public class FileHandler extends StreamHandler { * the log record to publish. */ @Override - public void publish(LogRecord record) { + public synchronized void publish(LogRecord record) { super.publish(record); flush(); if (limit > 0 && output.getLength() >= limit) { diff --git a/logging/src/main/java/java/util/logging/LogManager.java b/logging/src/main/java/java/util/logging/LogManager.java index d7ade24..413efb3 100644 --- a/logging/src/main/java/java/util/logging/LogManager.java +++ b/logging/src/main/java/java/util/logging/LogManager.java @@ -401,7 +401,6 @@ public class LogManager { * not have the required permissions to perform this action. */ public void readConfiguration() throws IOException { - checkAccess(); // check config class String configClassName = System .getProperty("java.util.logging.config.class"); //$NON-NLS-1$ @@ -436,7 +435,7 @@ public class LogManager { "logging.properties"), 8192); } // END android-added - readConfigurationImpl(input); + readConfiguration(input); } finally { if (input != null) { try { |