svn commit: r946677 - in /tomcat/trunk/java/org/apache: catalina/core/AprLifecycleListener.java tomcat/util/net/AprEndpoint.java

[jfclere]

Author: jfclere
Date: Thu May 20 15:50:51 2010
New Revision: 946677

URL: http://svn.apache.org/viewvc?rev=946677&view=rev
Log:
Oops... Minor errors.

Modified:
    tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=946677&r1=946676&r2=946677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Thu 
May 20 15:50:51 2010
@@ -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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=946677&r1=946676&r2=946677&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Thu May 20 
15:50:51 2010
@@ -370,7 +370,7 @@ public class AprEndpoint extends Abstrac
         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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org