Author: markt
Date: Thu May  1 11:51:26 2008
New Revision: 652620

URL: http://svn.apache.org/viewvc?rev=652620&view=rev
Log:
Add missing access check.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=652620&r1=652619&r2=652620&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May  1 11:51:26 2008
@@ -76,11 +76,6 @@
   +1: fhanik, markt
   -1: 
 
-* Add missing access check for ThreadWithAttributes
-  http://svn.apache.org/viewvc?rev=651662&view=rev
-  +1: markt, remm, fhanik
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43470
   Various copy and paste errors
   http://svn.apache.org/viewvc?rev=651675&view=rev

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java?rev=652620&r1=652619&r2=652620&view=diff
==============================================================================
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/threads/ThreadWithAttributes.java
 Thu May  1 11:51:26 2008
@@ -96,6 +96,7 @@
      * you can use notes for array access.
      */
     public final Hashtable getAttributes(Object control) {
+        if( this.control != control ) return null;
         return attributes;
     }
 }

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=652620&r1=652619&r2=652620&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May  1 11:51:26 2008
@@ -106,6 +106,9 @@
         <bug>44389</bug>: Fix memory leak that occurred if using a
         RequestDispatcher. Patch provided by Arto Huusko. (markt)
       </fix>
+      <fix>
+        Add missing access check for ThreadWithAttributes. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to