From a919494761b227b50216ccc748e25877111bde12 Mon Sep 17 00:00:00 2001 From: jfclere Date: Thu, 20 May 2010 15:50:51 +0000 Subject: [PATCH] Oops... Minor errors. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946677 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/AprLifecycleListener.java | 2 +- java/org/apache/tomcat/util/net/AprEndpoint.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java index daa5a7d85..63a1bfb4e 100644 --- a/java/org/apache/catalina/core/AprLifecycleListener.java +++ b/java/org/apache/catalina/core/AprLifecycleListener.java @@ -72,7 +72,7 @@ public class AprLifecycleListener protected static boolean sslAvailable = false; protected static boolean aprAvailable = false; - protected static String lock = ""; + protected static Object lock = new Object(); public static boolean isAprAvailable() { //https://issues.apache.org/bugzilla/show_bug.cgi?id=48613 diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index 5929e6372..610fe4a30 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -370,7 +370,7 @@ public class AprEndpoint extends AbstractEndpoint { if (initialized) return; if (!AprLifecycleListener.isAprAvailable()) { - throw new Exception(sm.getString("endpoint.init.notavail"); + throw new Exception(sm.getString("endpoint.init.notavail")); } // Create the root APR memory pool -- 2.11.0