Oops... Minor errors.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@946677 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java b/java/org/apache/catalina/core/AprLifecycleListener.java
index daa5a7d..63a1bfb 100644 (file)
--- 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 5929e63..610fe4a 100644 (file)
--- 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