Author: rjung
Date: Sat Sep 23 14:45:48 2017
New Revision: 1809434
URL: http://svn.apache.org/viewvc?rev=1809434&view=rev
Log:
Use the correct path when loading the JVM
logging.properties file for Java 9.
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1809434&r1=1809433&r2=1809434&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Sat Sep 23
14:45:48 2017
@@ -50,9 +50,22 @@ import java.util.logging.Logger;
* Short configuration information will be sent to <code>System.err</code>.
*/
public class ClassLoaderLogManager extends LogManager {
+
+ private static final boolean isJava9;
+
public static final String DEBUG_PROPERTY =
ClassLoaderLogManager.class.getName() + ".debug";
+ static {
+ Class<?> c = null;
+ try {
+ c = Class.forName("java.lang.Runtime$Version");
+ } catch (ClassNotFoundException e) {
+ // Must be Java 8
+ }
+ isJava9 = c != null;
+ }
+
private final class Cleaner extends Thread {
@Override
@@ -478,7 +491,8 @@ public class ClassLoaderLogManager exten
}
// Try the default JVM configuration
if (is == null) {
- File defaultFile = new File(new
File(System.getProperty("java.home"), "lib"),
+ File defaultFile = new File(new
File(System.getProperty("java.home"),
+ isJava9 ? "conf" : "lib"),
"logging.properties");
try {
is = new FileInputStream(defaultFile);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1809434&r1=1809433&r2=1809434&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Sep 23 14:45:48 2017
@@ -45,6 +45,14 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.1 (markt)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Use the correct path when loading the JVM
<code>logging.properties</code>
+ file for Java 9. (rjung)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.0 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
