tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1602508 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/AbstractProtocol.java java/org/apache/coyote/ContainerThreadMarker.java
Date Fri, 13 Jun 2014 19:45:10 GMT
Author: markt
Date: Fri Jun 13 19:45:10 2014
New Revision: 1602508

URL: http://svn.apache.org/r1602508
Log:
Backport change that added ContainerThreadMarker (needed for a backport to follow)

Added:
    tomcat/tc7.0.x/trunk/java/org/apache/coyote/ContainerThreadMarker.java
      - copied, changed from r1563206, tomcat/trunk/java/org/apache/coyote/ContainerThreadMarker.java
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1563206

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1602508&r1=1602507&r2=1602508&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProtocol.java Fri Jun 13 19:45:10
2014
@@ -576,6 +576,7 @@ public abstract class AbstractProtocol<S
             }
 
             wrapper.setAsync(false);
+            ContainerThreadMarker.markAsContainerThread();
 
             try {
                 if (processor == null) {

Copied: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ContainerThreadMarker.java (from r1563206,
tomcat/trunk/java/org/apache/coyote/ContainerThreadMarker.java)
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ContainerThreadMarker.java?p2=tomcat/tc7.0.x/trunk/java/org/apache/coyote/ContainerThreadMarker.java&p1=tomcat/trunk/java/org/apache/coyote/ContainerThreadMarker.java&r1=1563206&r2=1602508&rev=1602508&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ContainerThreadMarker.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ContainerThreadMarker.java Fri Jun 13 19:45:10
2014
@@ -18,7 +18,7 @@ package org.apache.coyote;
 
 public class ContainerThreadMarker {
 
-    private static final ThreadLocal<Boolean> marker = new ThreadLocal<>();
+    private static final ThreadLocal<Boolean> marker = new ThreadLocal<Boolean>();
 
     public static boolean isContainerThread() {
         Boolean flag = marker.get();



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


Mime
View raw message