Author: markt
Date: Tue Mar 25 22:55:34 2014
New Revision: 1581570
URL: http://svn.apache.org/r1581570
Log:
Locks should be outside try/catch/finally block.
Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1581570&r1=1581569&r2=1581570&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue Mar 25
22:55:34 2014
@@ -599,8 +599,8 @@ public abstract class ContainerBase exte
public Realm getRealm() {
Lock l = realmLock.readLock();
+ l.lock();
try {
- l.lock();
if (realm != null)
return (realm);
if (parent != null)
@@ -614,8 +614,8 @@ public abstract class ContainerBase exte
protected Realm getRealmInternal() {
Lock l = realmLock.readLock();
+ l.lock();
try {
- l.lock();
return realm;
} finally {
l.unlock();
@@ -631,10 +631,8 @@ public abstract class ContainerBase exte
public void setRealm(Realm realm) {
Lock l = realmLock.writeLock();
-
+ l.lock();
try {
- l.lock();
-
// Change components if necessary
Realm oldRealm = this.realm;
if (oldRealm == realm)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
