[patch] 2011-10-29_tc6_52091_StandardWrapper.patch

2011-10-29_tc6_52091_StandardWrapper.patch (text/plain), 5.38 KB, created by Konstantin Kolinko on 2011-10-28 22:55:06 UTC

(hide)

Description: 2011-10-29_tc6_52091_StandardWrapper.patch

Filename:

MIME Type:

Creator: Konstantin Kolinko

Created: 2011-10-28 22:55:06 UTC

Size: 5.38 KB

patch

obsolete

>Index: java/org/apache/catalina/core/StandardWrapper.java >=================================================================== >--- java/org/apache/catalina/core/StandardWrapper.java (revision 1190622) >+++ java/org/apache/catalina/core/StandardWrapper.java (working copy) >@@ -29,6 +29,7 @@ > import java.util.Properties; > import java.util.Stack; > import java.util.concurrent.atomic.AtomicInteger; >+import java.util.concurrent.locks.ReentrantReadWriteLock; > import java.security.AccessController; > import java.security.PrivilegedActionException; > import java.security.PrivilegedExceptionAction; >@@ -292,8 +293,16 @@ > * Restricted servlets (which can only be loaded by a privileged webapp). > */ > protected static Properties restrictedServlets = null; >- >- >+ >+ private final ReentrantReadWriteLock parametersLock = >+ new ReentrantReadWriteLock(); >+ >+ private final ReentrantReadWriteLock mappingsLock = >+ new ReentrantReadWriteLock(); >+ >+ private final ReentrantReadWriteLock referencesLock = >+ new ReentrantReadWriteLock(); >+ > // ------------------------------------------------------------- Properties > > >@@ -713,8 +722,11 @@ > */ > public void addInitParameter(String name, String value) { > >- synchronized (parameters) { >+ try { >+ parametersLock.writeLock().lock(); > parameters.put(name, value); >+ } finally { >+ parametersLock.writeLock().unlock(); > } > fireContainerEvent("addInitParameter", name); > >@@ -740,8 +752,11 @@ > */ > public void addMapping(String mapping) { > >- synchronized (mappings) { >+ try { >+ mappingsLock.writeLock().lock(); > mappings.add(mapping); >+ } finally { >+ mappingsLock.writeLock().unlock(); > } > fireContainerEvent("addMapping", mapping); > >@@ -757,8 +772,11 @@ > */ > public void addSecurityReference(String name, String link) { > >- synchronized (references) { >+ try { >+ referencesLock.writeLock().lock(); > references.put(name, link); >+ } finally { >+ referencesLock.writeLock().unlock(); > } > fireContainerEvent("addSecurityReference", name); > >@@ -902,8 +920,11 @@ > */ > public String findInitParameter(String name) { > >- synchronized (parameters) { >+ try { >+ parametersLock.readLock().lock(); > return ((String) parameters.get(name)); >+ } finally { >+ parametersLock.readLock().unlock(); > } > > } >@@ -915,9 +936,12 @@ > */ > public String[] findInitParameters() { > >- synchronized (parameters) { >+ try { >+ parametersLock.readLock().lock(); > String results[] = new String[parameters.size()]; > return ((String[]) parameters.keySet().toArray(results)); >+ } finally { >+ parametersLock.readLock().unlock(); > } > > } >@@ -928,8 +952,11 @@ > */ > public String[] findMappings() { > >- synchronized (mappings) { >+ try { >+ mappingsLock.readLock().lock(); > return (String[]) mappings.toArray(new String[mappings.size()]); >+ } finally { >+ mappingsLock.readLock().unlock(); > } > > } >@@ -943,8 +970,11 @@ > */ > public String findSecurityReference(String name) { > >- synchronized (references) { >+ try { >+ referencesLock.readLock().lock(); > return ((String) references.get(name)); >+ } finally { >+ referencesLock.readLock().unlock(); > } > > } >@@ -956,9 +986,12 @@ > */ > public String[] findSecurityReferences() { > >- synchronized (references) { >+ try { >+ referencesLock.readLock().lock(); > String results[] = new String[references.size()]; > return ((String[]) references.keySet().toArray(results)); >+ } finally { >+ referencesLock.readLock().unlock(); > } > > } >@@ -1248,8 +1281,11 @@ > */ > public void removeInitParameter(String name) { > >- synchronized (parameters) { >+ try { >+ parametersLock.writeLock().lock(); > parameters.remove(name); >+ } finally { >+ parametersLock.writeLock().unlock(); > } > fireContainerEvent("removeInitParameter", name); > >@@ -1275,8 +1311,11 @@ > */ > public void removeMapping(String mapping) { > >- synchronized (mappings) { >+ try { >+ mappingsLock.writeLock().lock(); > mappings.remove(mapping); >+ } finally { >+ mappingsLock.writeLock().unlock(); > } > fireContainerEvent("removeMapping", mapping); > >@@ -1290,8 +1329,11 @@ > */ > public void removeSecurityReference(String name) { > >- synchronized (references) { >+ try { >+ referencesLock.writeLock().lock(); > references.remove(name); >+ } finally { >+ referencesLock.writeLock().unlock(); > } > fireContainerEvent("removeSecurityReference", name); > >@@ -1488,8 +1530,11 @@ > */ > public Enumeration getInitParameterNames() { > >- synchronized (parameters) { >+ try { >+ parametersLock.readLock().lock(); > return (new Enumerator(parameters.keySet())); >+ } finally { >+ parametersLock.readLock().unlock(); > } > > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]