Re: Usage of JreVendor class

[Felix Schumacher]

Am 16. September 2015 22:45:14 MESZ, schrieb "Rémy Maucherat" :
>2015-09-16 22:34 GMT+02:00 Mark Thomas :
>
>> I'd expect tomcat-utils.jar
>>
>> No problem.

In tomcat 7 that class resides in tomcat-coyote.

Should I move it, too? 

Regards, 
Felix 
>
>Rémy


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

svn commit: r1703509 - in /tomcat/trunk/java/org/apache/coyote: AbstractProcessor.java Request.java Response.java

[markt]

Author: markt
Date: Thu Sep 17 07:42:37 2015
New Revision: 1703509

URL: http://svn.apache.org/r1703509
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58387
Fix rare data race

Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/trunk/java/org/apache/coyote/Request.java
tomcat/trunk/java/org/apache/coyote/Response.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1703509=1703508=1703509=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Thu Sep 17 
07:42:37 2015
@@ -85,6 +85,7 @@ public abstract class AbstractProcessor
 response = coyoteResponse;
 response.setHook(this);
 request.setResponse(response);
+request.setHook(this);
 }
 
 /**

Modified: tomcat/trunk/java/org/apache/coyote/Request.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Request.java?rev=1703509=1703508=1703509=diff
==
--- tomcat/trunk/java/org/apache/coyote/Request.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Request.java Thu Sep 17 07:42:37 2015
@@ -131,7 +131,7 @@ public final class Request {
 private final HashMap attributes = new HashMap<>();
 
 private Response response;
-private ActionHook hook;
+private volatile ActionHook hook;
 
 private long bytesRead=0;
 // Time of the request - useful to avoid repeated calls to 
System.currentTime
@@ -350,18 +350,18 @@ public final class Request {
 return response;
 }
 
-public void setResponse( Response response ) {
-this.response=response;
-response.setRequest( this );
+public void setResponse(Response response) {
+this.response = response;
+response.setRequest(this);
 }
 
-public void action(ActionCode actionCode, Object param) {
-if( hook==null && response!=null ) {
-hook=response.getHook();
-}
+protected void setHook(ActionHook hook) {
+this.hook = hook;
+}
 
+public void action(ActionCode actionCode, Object param) {
 if (hook != null) {
-if( param==null ) {
+if (param == null) {
 hook.action(actionCode, this);
 } else {
 hook.action(actionCode, param);

Modified: tomcat/trunk/java/org/apache/coyote/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/Response.java?rev=1703509=1703508=1703509=diff
==
--- tomcat/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/trunk/java/org/apache/coyote/Response.java Thu Sep 17 07:42:37 2015
@@ -94,7 +94,7 @@ public final class Response {
 /**
  * Action hook.
  */
-public ActionHook hook;
+protected volatile ActionHook hook;
 
 
 /**
@@ -143,19 +143,13 @@ public final class Response {
 }
 
 
-public ActionHook getHook() {
-return hook;
-}
-
-
-public void setHook(ActionHook hook) {
+protected void setHook(ActionHook hook) {
 this.hook = hook;
 }
 
 
 //  Per-Response "notes" 
 
-
 public final void setNote(int pos, Object value) {
 notes[pos] = value;
 }
@@ -168,20 +162,19 @@ public final class Response {
 
 //  Actions 
 
-
 public void action(ActionCode actionCode, Object param) {
 if (hook != null) {
-if( param==null )
+if (param == null) {
 hook.action(actionCode, this);
-else
+} else {
 hook.action(actionCode, param);
+}
 }
 }
 
 
 //  State 
 
-
 public int getStatus() {
 return status;
 }



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

svn commit: r1703516 - in /tomcat/tc8.0.x/trunk: java/org/apache/coyote/http11/Http11Nio2Processor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 08:20:16 2015
New Revision: 1703516

URL: http://svn.apache.org/r1703516
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58388
Fix a data race when determining if Comet processing is occurring on a 
container or non-container thread.

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1703516=1703515=1703516=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java 
Thu Sep 17 08:20:16 2015
@@ -25,6 +25,7 @@ import java.util.Set;
 import javax.net.ssl.SSLEngine;
 
 import org.apache.coyote.ActionCode;
+import org.apache.coyote.ContainerThreadMarker;
 import org.apache.coyote.ErrorState;
 import org.apache.coyote.RequestInfo;
 import org.apache.coyote.http11.filters.BufferedInputFilter;
@@ -516,8 +517,7 @@ public class Http11Nio2Processor extends
 if (socketWrapper == null || socketWrapper.getSocket() == null) {
 return;
 }
-RequestInfo rp = request.getRequestProcessor();
-if (rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE) {
+if (!ContainerThreadMarker.isContainerThread()) {
 // Close event for this processor triggered by request
 // processing in another processor, a non-Tomcat thread (i.e.
 // an application controlled thread) or similar.
@@ -532,10 +532,9 @@ public class Http11Nio2Processor extends
 if (socketWrapper == null) {
 return;
 }
-long timeout = ((Long)param).longValue();
-//if we are not piggy backing on a worker thread, set the timeout
-RequestInfo rp = request.getRequestProcessor();
-if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) {
+// If we are not piggy backing on a worker thread, set the timeout
+if (!ContainerThreadMarker.isContainerThread()) {
+long timeout = ((Long)param).longValue();
 socketWrapper.setTimeout(timeout);
 }
 break;

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1703516=1703515=1703516=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Sep 17 08:20:16 2015
@@ -156,6 +156,10 @@
 58387: Fix a rare data race when closing Comet connections.
 (markt)
   
+  
+58388: Fix a data race when determining if Comet processing
+is occurring on a container or non-container thread. (markt)
+  
 
   
   



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

[Bug 58388] Data race on field org.apache.coyote.RequestInfo.stage

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58388

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #2 from Mark Thomas  ---
Fixed in 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58424] New: javaee tck fail(category=jsf, test name= jsfTldSignatureTest

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58424

Bug ID: 58424
   Summary: javaee tck fail(category=jsf, test name=
jsfTldSignatureTest
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: sungbae_y...@tmax.co.kr

I've ported Japser into my JavaEE7 product.
When I ran tck, test failed.

com/sun/ts/tests/jsf/spec/webapp/tldsig/URLClient.java#jsfTldSignatureTest   
Failed. Test case throws exception: [BaseUrlClient] null failed!  Check output
for cause of failure.

This test compares TagLibraryInfos of jsf_core.tld file.
One is loaded from test's parser, the other is loaded from testee's parser
code.

The test prints out like this even though tld file has value 'true'.
Taglibrary 'http://java.sun.com/jsf/core' FAILED
[http://java.sun.com/jsf/core:viewParam:id] - Mismatch on rtexpr value
configuration - expected: true, received: false

I checked TldRuleSet code that is used to parse tld file and found out that
Jasper needs to trim body text in case of tld file which has element body like
this

true


TldRuleSet$GenericBooleanRule cannot convert this(\ntrue\n) to true.

Plz, check this. Thanks.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58424] javaee tck fail(category=jsf, test name= jsfTldSignatureTest)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58424

sungbae_y...@tmax.co.kr changed:

   What|Removed |Added

Summary|javaee tck  |javaee tck
   |fail(category=jsf, test |fail(category=jsf, test
   |name= jsfTldSignatureTest   |name= jsfTldSignatureTest)

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703512 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/coyote/AbstractProcessor.java java/org/apache/coyote/Request.java java/org/apache/coyote/Response.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 07:46:36 2015
New Revision: 1703512

URL: http://svn.apache.org/r1703512
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58387
Fix rare data race when closing Comet connections.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/Request.java
tomcat/tc8.0.x/trunk/java/org/apache/coyote/Response.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 07:46:36 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

[Bug 58387] Data race on field org.apache.coyote.Request.hook

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58387

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703523 - /tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java

[markt]

Author: markt
Date: Thu Sep 17 08:34:53 2015
New Revision: 1703523

URL: http://svn.apache.org/r1703523
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58389
Fix rare data race

Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java?rev=1703523=1703522=1703523=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java Thu Sep 17 
08:34:53 2015
@@ -25,17 +25,17 @@ import java.util.concurrent.TimeUnit;
  * As task queue specifically designed to run with a thread pool executor. The
  * task queue is optimised to properly utilize threads within a thread pool
  * executor. If you use a normal queue, the executor will spawn threads when
- * there are idle threads and you wont be able to force items unto the queue
+ * there are idle threads and you wont be able to force items onto the queue
  * itself.
  */
 public class TaskQueue extends LinkedBlockingQueue {
 
 private static final long serialVersionUID = 1L;
 
-private ThreadPoolExecutor parent = null;
+private volatile ThreadPoolExecutor parent = null;
 
-// no need to be volatile, the one times when we change and read it occur 
in
-// a single thread (the one that did stop a context and fired listeners)
+// No need to be volatile. This is written and read in a single thread
+// (when stopping a context and firing the  listeners)
 private Integer forcedRemainingCapacity = null;
 
 public TaskQueue() {



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

[Bug 58389] Data race on field org.apache.tomcat.util.threads.TaskQueue.parent

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58389

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #2 from Mark Thomas  ---
Fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703534 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java NioEndpoint.java SocketWrapperBase.java

[markt]

Author: markt
Date: Thu Sep 17 08:56:20 2015
New Revision: 1703534

URL: http://svn.apache.org/r1703534
Log:
Code review / refactoring in light of 
https://bz.apache.org/bugzilla/show_bug.cgi?id=58390
error is only used by NIO2 so move it to Nio2SocketWrapper

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1703534=1703533=1703534=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Sep 17 
08:56:20 2015
@@ -577,6 +577,7 @@ public class Nio2Endpoint extends Abstra
 private final Semaphore writePending = new Semaphore(1);
 private boolean writeInterest = false; // Guarded by 
writeCompletionHandler
 private boolean writeNotify = false;
+private volatile IOException error = null;
 
 private CompletionHandler 
awaitBytesHandler
 = new CompletionHandler() {
@@ -847,6 +848,9 @@ public class Nio2Endpoint extends Abstra
 public void setSendfileData(SendfileData sf) { this.sendfileData = sf; 
}
 public SendfileData getSendfileData() { return this.sendfileData; }
 
+public IOException getError() { return error; }
+public void setError(IOException error) { this.error = error; }
+
 
 @Override
 public boolean isReadyForRead() throws IOException {
@@ -1250,6 +1254,11 @@ public class Nio2Endpoint extends Abstra
 
 @Override
 protected void flushBlocking() throws IOException {
+if (getError() != null) {
+throw getError();
+}
+
+
 // Before doing a blocking flush, make sure that any pending non
 // blocking write has completed.
 try {
@@ -1266,7 +1275,11 @@ public class Nio2Endpoint extends Abstra
 }
 
 @Override
-protected boolean flushNonBlocking() {
+protected boolean flushNonBlocking() throws IOException {
+if (getError() != null) {
+throw getError();
+}
+
 return flushNonBlocking(false);
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1703534=1703533=1703534=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Sep 17 
08:56:20 2015
@@ -1071,8 +1071,6 @@ public class NioEndpoint extends Abstrac
 NioSocketWrapper ka = (NioSocketWrapper) 
key.attachment();
 if ( ka == null ) {
 cancelledKey(key); //we don't support any keys 
without attachments
-} else if ( ka.getError() != null) {
-cancelledKey(key);//TODO this is not yet being used
 } else if ((ka.interestOps()_READ) == 
SelectionKey.OP_READ ||
   (ka.interestOps()_WRITE) == 
SelectionKey.OP_WRITE) {
 if (close) {

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1703534=1703533=1703534=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Thu Sep 
17 08:56:20 2015
@@ -46,7 +46,6 @@ public abstract class SocketWrapperBase<
 private volatile long readTimeout = -1;
 private volatile long writeTimeout = -1;
 
-private IOException error = null;
 private volatile int keepAliveLeft = 100;
 private volatile boolean async = false;
 private boolean keptAlive = false;
@@ -199,8 +198,6 @@ public abstract class SocketWrapperBase<
 }
 
 
-public IOException getError() { return error; }
-public void setError(IOException error) { this.error = error; }
 public void setKeepAliveLeft(int keepAliveLeft) { this.keepAliveLeft = 
keepAliveLeft;}
 public int decrementKeepAlive() { return (--keepAliveLeft);}
 public boolean isKeptAlive() {return keptAlive;}
@@ -484,10 +481,6 @@ public abstract class SocketWrapperBase<
 return false;
 }
 
-   

svn commit: r1703536 - in /tomcat/tc8.0.x/trunk: java/org/apache/tomcat/util/net/NioEndpoint.java java/org/apache/tomcat/util/net/SocketWrapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 09:01:20 2015
New Revision: 1703536

URL: http://svn.apache.org/r1703536
Log: (empty)

Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1703536=1703535=1703536=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu 
Sep 17 09:01:20 2015
@@ -1286,8 +1286,6 @@ public class NioEndpoint extends Abstrac
 KeyAttachment ka = (KeyAttachment) key.attachment();
 if ( ka == null ) {
 cancelledKey(key, SocketStatus.ERROR); //we don't 
support any keys without attachments
-} else if ( ka.getError() ) {
-cancelledKey(key, SocketStatus.ERROR);//TODO this 
is not yet being used
 } else if (ka.getCometNotify() ) {
 ka.setCometNotify(false);
 int ops = ka.interestOps() & ~OP_CALLBACK;

Modified: 
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java?rev=1703536=1703535=1703536=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java 
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/SocketWrapper.java Thu 
Sep 17 09:01:20 2015
@@ -32,7 +32,7 @@ public class SocketWrapper {
 private volatile long lastAccess = System.currentTimeMillis();
 private volatile long timeout = -1;
 
-private boolean error = false;
+private volatile boolean error = false;
 private volatile int keepAliveLeft = 100;
 private volatile boolean comet = false;
 private volatile boolean async = false;
@@ -100,6 +100,7 @@ public class SocketWrapper {
 public void access(long access) { lastAccess = access; }
 public void setTimeout(long timeout) {this.timeout = timeout;}
 public long getTimeout() {return this.timeout;}
+// error is used by NIO2 - will move to Nio2SocketWraper in Tomcat 9
 public boolean getError() { return error; }
 public void setError(boolean error) { this.error = error; }
 public void setKeepAliveLeft(int keepAliveLeft) { this.keepAliveLeft = 
keepAliveLeft;}

Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1703536=1703535=1703536=diff
==
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Sep 17 09:01:20 2015
@@ -164,6 +164,10 @@
 58389: Fix a rare data race while shutting down the thread
 pools on Connector stop. (markt)
   
+  
+Clean up use of error flag on socket wrapper prompted by
+58390. (markt)
+  
 
   
   



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

svn commit: r1703545 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java

[markt]

Author: markt
Date: Thu Sep 17 09:26:08 2015
New Revision: 1703545

URL: http://svn.apache.org/r1703545
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58392
Double-checked locking needs to use volatile to be thread-safe

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java?rev=1703545=1703544=1703545=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
 Thu Sep 17 09:26:08 2015
@@ -37,7 +37,7 @@ import org.apache.juli.logging.LogFactor
 public class DomainFilterInterceptor extends ChannelInterceptorBase {
 private static final Log log = 
LogFactory.getLog(DomainFilterInterceptor.class);
 protected static final StringManager sm = 
StringManager.getManager(DomainFilterInterceptor.class);
-protected Membership membership = null;
+protected volatile Membership membership = null;
 
 protected byte[] domain = new byte[0];
 



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

svn commit: r1703554 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

[markt]

Author: markt
Date: Thu Sep 17 10:13:33 2015
New Revision: 1703554

URL: http://svn.apache.org/r1703554
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58393
Fix multiple data races

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1703554=1703553=1703554=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
Thu Sep 17 10:13:33 2015
@@ -62,7 +62,7 @@ public class McastService implements Mem
 /**
  * A membership listener delegate (should be the cluster :)
  */
-protected MembershipListener listener;
+protected volatile MembershipListener listener;
 /**
  * A message listener delegate for broadcasts
  */
@@ -459,7 +459,10 @@ public class McastService implements Mem
 
 @Override
 public void memberAdded(Member member) {
-if ( listener!=null ) listener.memberAdded(member);
+MembershipListener listener = this.listener;
+if (listener != null) {
+listener.memberAdded(member);
+}
 }
 
 /**
@@ -467,9 +470,11 @@ public class McastService implements Mem
  * @param member The member
  */
 @Override
-public void memberDisappeared(Member member)
-{
-if ( listener!=null ) listener.memberDisappeared(member);
+public void memberDisappeared(Member member) {
+MembershipListener listener = this.listener;
+if (listener != null) {
+listener.memberDisappeared(member);
+}
 }
 
 @Override



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

buildbot exception in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a build exception on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/300

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1703554
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




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

svn commit: r1703584 - /tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java

[schultz]

Author: schultz
Date: Thu Sep 17 12:01:44 2015
New Revision: 1703584

URL: http://svn.apache.org/r1703584
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58424
Trim value text before comparing against acceptable boolean String values.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java?rev=1703584=1703583=1703584=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java Thu 
Sep 17 12:01:44 2015
@@ -352,6 +352,8 @@ public class TldRuleSet extends RuleSetB
 
 @Override
 public void body(String namespace, String name, String text) throws 
Exception {
+if(null != text)
+text = text.trim();
 boolean value = "true".equalsIgnoreCase(text) || 
"yes".equalsIgnoreCase(text);
 setter.invoke(digester.peek(), Boolean.valueOf(value));
 }



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

[Bug 58393] Data race on field org.apache.catalina.tribes.membership.McastService.listener

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58393

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703556 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/McastService.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 10:29:30 2015
New Revision: 1703556

URL: http://svn.apache.org/r1703556
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58393
Fix multiple data races

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 10:29:30 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

buildbot exception in ASF Buildbot on tomcat-8-trunk

[buildbot]

The Buildbot has detected a build exception on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/135

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1703556
Blamelist: markt

BUILD FAILED: exception upload_2

Sincerely,
 -The Buildbot




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

svn commit: r1703525 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/threads/TaskQueue.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 08:40:04 2015
New Revision: 1703525

URL: http://svn.apache.org/r1703525
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58389
Fix a rare data race while shutting down the thread pools on Connector stop.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 08:40:04 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

[Bug 58390] Data race on field org.apache.tomcat.util.net.SocketWrapper.error

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58390

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
The flag is only ever used by NIO2 so trunk has been refactored.

The flag is never read by NIO2 in 8.0.x so there is no issues here.

The flag was read by NIO in 8.0.x but since that read would always be false the
code has been removed. (The same code was removed from trunk).

The flag is read in trunk and it has been made volatile since it is likely to
be read and written in different threads.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703542 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java

[markt]

Author: markt
Date: Thu Sep 17 09:20:40 2015
New Revision: 1703542

URL: http://svn.apache.org/r1703542
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58391
Multiple data races

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1703542=1703541=1703542=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
 Thu Sep 17 09:20:40 2015
@@ -153,7 +153,7 @@ public class NonBlockingCoordinator exte
 /**
  * Our current view
  */
-protected Membership view = null;
+protected volatile Membership view = null;
 /**
  * Out current viewId
  */
@@ -169,9 +169,9 @@ public class NonBlockingCoordinator exte
  * and this is the one we are running
  */
 protected UniqueId suggestedviewId;
-protected Membership suggestedView;
+protected volatile Membership suggestedView;
 
-protected boolean started = false;
+protected volatile boolean started = false;
 protected final int startsvc = 0x;
 
 protected final Object electionMutex = new Object();



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

[Bug 58391] Data races on field org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator.started/view/suggestedView

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58391

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703546 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 09:29:07 2015
New Revision: 1703546

URL: http://svn.apache.org/r1703546
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58392
Double-checked locking needs to use volatile to be thread-safe

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/DomainFilterInterceptor.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 09:29:07 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

svn commit: r1703543 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 09:22:58 2015
New Revision: 1703543

URL: http://svn.apache.org/r1703543
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58391
Fix multiple data races, most of which were associated with ensuring that log 
messages contained the correct information.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 09:22:58 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

[Bug 58392] Data race on field org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor.membership

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58392

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58425] New: validate::jk_ajp12_worker.c always returns JK_FALSE.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58425

Bug ID: 58425
   Summary: validate::jk_ajp12_worker.c always returns JK_FALSE.
   Product: Tomcat Connectors
   Version: 1.2.41
  Hardware: PC
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
  Assignee: dev@tomcat.apache.org
  Reporter: yagis...@reudo.co.jp

The function "validate" in jk_ajp12_worker.c always returns JK_FALSE, so ajp12
worker can not be initialized.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703647 - /tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java

[remm]

Author: remm
Date: Thu Sep 17 15:26:39 2015
New Revision: 1703647

URL: http://svn.apache.org/r1703647
Log:
Remove test message comparison.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1703647=1703646=1703647=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Thu Sep 17 
15:26:39 2015
@@ -147,7 +147,7 @@ public class TestSsl extends TomcatBaseT
 }
 
 private void doRequest(OutputStream os, Reader r) throws IOException {
-char[] expectedResponseLine = "HTTP/1.1 200 OK\r\n".toCharArray();
+char[] expectedResponseLine = "HTTP/1.1 200 \r\n".toCharArray();
 
 os.write("GET /tester HTTP/1.1\r\n".getBytes());
 os.write("Host: localhost\r\n".getBytes());



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

buildbot success in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/303

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1703647
Blamelist: remm

Build succeeded!

Sincerely,
 -The Buildbot




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

svn commit: r1703621 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java webapps/docs/changelog.xml

[schultz]

Author: schultz
Date: Thu Sep 17 13:36:58 2015
New Revision: 1703621

URL: http://svn.apache.org/r1703621
Log:
Back-port r1703584 to fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58424
Trim value text before comparing against acceptable boolean String values.

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/descriptor/tld/TldRuleSet.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 13:36:58 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

buildbot failure in ASF Buildbot on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-trunk/builds/302

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch tomcat/trunk] 1703640
Blamelist: remm

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

buildbot success in ASF Buildbot on tomcat-8-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-8-trunk while 
building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/tomcat-8-trunk/builds/136

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-8-commit' 
triggered this build
Build Source Stamp: [branch tomcat/tc8.0.x/trunk] 1703621
Blamelist: schultz

Build succeeded!

Sincerely,
 -The Buildbot




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

[Bug 58425] validate::jk_ajp12_worker.c always returns JK_FALSE.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58425

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #1 from Christopher Schultz  ---
I don't believe AJP12 is supported any longer (for as long as I can remember).
Do you need it for something?

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703640 - in /tomcat/trunk/java/org/apache/tomcat/util/net: NioEndpoint.java SecureNioChannel.java

[remm]

Author: remm
Date: Thu Sep 17 14:52:39 2015
New Revision: 1703640

URL: http://svn.apache.org/r1703640
Log:
Remove finally and leave the channel in sendfile mode until the sendfile is 
done. Also check for close first since sendfile is reset on closing.
Note: this could hide away 57265, so it's probably a good idea to not port it 
to 8.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=1703640=1703639=1703640=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Thu Sep 17 
14:52:39 2015
@@ -958,7 +958,9 @@ public class NioEndpoint extends Abstrac
 
 // Configure output channel
 sc = socketWrapper.getSocket();
-sc.setSendFile(true);
+if (calledByProcessor) {
+sc.setSendFile(true);
+}
 // TLS/SSL channel is slightly different
 WritableByteChannel wc = ((sc instanceof 
SecureNioChannel)?sc:sc.getIOChannel());
 
@@ -987,6 +989,7 @@ public class NioEndpoint extends Abstrac
 log.debug("Send file complete for: "+sd.fileName);
 }
 socketWrapper.setSendfileData(null);
+sc.setSendFile(false);
 try {
 sd.fchannel.close();
 } catch (Exception ignore) {
@@ -1035,8 +1038,6 @@ public class NioEndpoint extends Abstrac
 cancelledKey(sk);
 }
 return SendfileState.ERROR;
-} finally {
-if (sc!=null) sc.setSendFile(false);
 }
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=1703640=1703639=1703640=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java Thu Sep 
17 14:52:39 2015
@@ -583,12 +583,12 @@ public class SecureNioChannel extends Ni
 int written = sc.write(src);
 return written;
 } else {
+//are we closing or closed?
+if ( closing || closed) throw new 
IOException(sm.getString("channel.nio.ssl.closing"));
 //make sure we can handle expand, and that we only use one buffer
 if (!this.isSendFile() && src != bufHandler.getWriteBuffer()) {
 throw new 
IllegalArgumentException(sm.getString("channel.nio.ssl.invalidBuffer"));
 }
-//are we closing or closed?
-if ( closing || closed) throw new 
IOException(sm.getString("channel.nio.ssl.closing"));
 
 //the number of bytes written
 int written = 0;



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

[Bug 51872] request.getRemoteAddr() sometimes returning IP address from the previous request

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=51872

--- Comment #17 from Tim Hunt  ---
I just want to note that, like others, we are still seeing these symptoms, and
I created bug 58289. I have not yet had time to create a minimal test-case, but
I want to if I can.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58424] javaee tck fail(category=jsf, test name= jsfTldSignatureTest)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58424

Christopher Schultz  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Christopher Schultz  ---
Fixed in trunk in r1703584.
Fixed in Tomcat 8 in r1703621. Will be in Tomcat 8.0.27.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58414] Can not transfer empty string through Web Socket

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58414

Evgeny Mironenko  changed:

   What|Removed |Added

 CC||emiron...@gmail.com

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703680 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

[markt]

Author: markt
Date: Thu Sep 17 20:30:44 2015
New Revision: 1703680

URL: http://svn.apache.org/viewvc?rev=1703680=rev
Log:
Fix multiple concurrency issues in MemberImpl
Concurrent updates to some properties were likely to lead to issues.
Fix the Javadoc warnings

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java?rev=1703680=1703679=1703680=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java Thu 
Sep 17 20:30:44 2015
@@ -47,21 +47,21 @@ public class MemberImpl implements Membe
 /**
  * The listen host for this member
  */
-protected byte[] host;
-protected transient String hostname;
+protected volatile byte[] host;
+protected volatile transient String hostname;
 /**
  * The tcp listen port for this member
  */
-protected int port;
+protected volatile int port;
 /**
  * The udp listen port for this member
  */
-protected int udpPort = -1;
+protected volatile int udpPort = -1;
 
 /**
  * The tcp/SSL listen port for this member
  */
-protected int securePort = -1;
+protected volatile int securePort = -1;
 
 /**
  * Counter for how many broadcast messages have been sent from this member
@@ -87,24 +87,24 @@ public class MemberImpl implements Membe
 /**
  * Unique session Id for this member
  */
-protected byte[] uniqueId = new byte[16];
+protected volatile byte[] uniqueId = new byte[16];
 
 /**
  * Custom payload that an app framework can broadcast
  * Also used to transport stop command.
  */
-protected byte[] payload = new byte[0];
+protected volatile byte[] payload = new byte[0];
 
 /**
  * Command, so that the custom payload doesn't have to be used
  * This is for internal tribes use, such as SHUTDOWN_COMMAND
  */
-protected byte[] command = new byte[0];
+protected volatile byte[] command = new byte[0];
 
 /**
  * Domain if we want to filter based on domain.
  */
-protected byte[] domain = new byte[0];
+protected volatile byte[] domain = new byte[0];
 
 /**
  * Empty constructor for serialization
@@ -114,10 +114,14 @@ public class MemberImpl implements Membe
 }
 
 /**
- * Construct a new member object
+ * Construct a new member object.
+ *
  * @param host - the tcp listen host
  * @param port - the tcp listen port
  * @param aliveTime - the number of milliseconds since this member was 
created
+ *
+ * @throws IOException If there is an error converting the host name to an
+ * IP address
  */
 public MemberImpl(String host,
   int port,
@@ -172,7 +176,7 @@ public class MemberImpl implements Membe
 
 
 @Override
-public int getDataLength() {
+public synchronized int getDataLength() {
 return TRIBES_MBR_BEGIN.length+ //start pkg
4+ //data length
8+ //alive time
@@ -193,7 +197,7 @@ public class MemberImpl implements Membe
 
 
 @Override
-public byte[] getData(boolean getalive, boolean reset)  {
+public synchronized byte[] getData(boolean getalive, boolean reset)  {
 if ( reset ) dataPkg = null;
 //look in cache first
 if ( dataPkg!=null ) {
@@ -223,9 +227,7 @@ public class MemberImpl implements Membe
 //payload length - 4 bytes
 //payload plen bytes
 //end package TRIBES_MBR_END.length
-byte[] addr = host;
 long alive=System.currentTimeMillis()-getServiceStartTime();
-byte hl = (byte)addr.length;
 byte[] data = new byte[getDataLength()];
 
 int bodylength = (getDataLength() - TRIBES_MBR_BEGIN.length - 
TRIBES_MBR_END.length - 4);
@@ -253,10 +255,10 @@ public class MemberImpl implements Membe
 XByteBuffer.toBytes(udpPort,data,pos);
 pos += 4;
 //host length
-data[pos++] = hl;
+data[pos++] = (byte) host.length;
 //host
-System.arraycopy(addr,0,data,pos,addr.length);
-pos+=addr.length;
+System.arraycopy(host,0,data,pos,host.length);
+pos+=host.length;
 //clen - 4 bytes
 XByteBuffer.toBytes(command.length,data,pos);
 pos+=4;
@@ -287,9 +289,12 @@ public class MemberImpl implements Membe
 return data;
 }
 /**
- * Deserializes a member from data sent over the wire
- * @param data - the bytes received
- * @return a member object.
+ * Deserializes a member from data sent over the wire.
+ *
+ * @param data   The bytes received
+ * 

[Bug 58244] two way SSL loses client certificate after a few requests

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58244

--- Comment #2 from David Balažic  ---
The problem also goes away temporarily if I restart Firefox or just clear the
"Active Logins" in the history deleting dialog. Then after 30 seconds it
happens again.
Maybe related to SSL session length?

Any suggestion how to debug this is welcome.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1703673 - /tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java

[markt]

Author: markt
Date: Thu Sep 17 19:27:07 2015
New Revision: 1703673

URL: http://svn.apache.org/viewvc?rev=1703673=rev
Log:
Fix data race

Modified:
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java

Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1703673=1703672=1703673=diff
==
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Thu Sep 17 
19:27:07 2015
@@ -56,7 +56,7 @@ public final class Mapper {
 /**
  * Array containing the virtual hosts definitions.
  */
-protected MappedHost[] hosts = new MappedHost[0];
+protected volatile MappedHost[] hosts = new MappedHost[0];
 
 
 /**
@@ -168,7 +168,7 @@ public final class Mapper {
 }
 }
 
-private boolean addHostAliasImpl(MappedHost newAlias) {
+private synchronized boolean addHostAliasImpl(MappedHost newAlias) {
 MappedHost[] newHosts = new MappedHost[hosts.length + 1];
 if (insertMap(hosts, newHosts, newAlias)) {
 hosts = newHosts;



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

svn commit: r1703685 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/MemberImpl.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 20:35:23 2015
New Revision: 1703685

URL: http://svn.apache.org/viewvc?rev=1703685=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58395
Fix multiple concurrency issues in MemberImpl
Concurrent updates to some properties were likely to lead to issues.
Fix the Javadoc warnings

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/MemberImpl.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 20:35:23 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

svn commit: r1703678 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

[markt]

Author: markt
Date: Thu Sep 17 20:08:51 2015
New Revision: 1703678

URL: http://svn.apache.org/viewvc?rev=1703678=rev
Log:
Remove duplicate calls

Modified:

tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1703678=1703677=1703678=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java 
Thu Sep 17 20:08:51 2015
@@ -203,7 +203,6 @@ public class McastServiceImpl {
 receivePacket.setAddress(address);
 receivePacket.setPort(port);
 member.setCommand(new byte[0]);
-member.getData(true, true);
 if ( membership == null ) membership = new Membership(member);
 }
 
@@ -326,7 +325,6 @@ public class McastServiceImpl {
 if ( startLevel == 0 ) {
 //send a stop message
 member.setCommand(Member.SHUTDOWN_PAYLOAD);
-member.getData(true, true);
 send(false);
 //leave mcast group
 try {socket.leaveGroup(address);}catch ( Exception ignore){}



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

svn commit: r1703674 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/mapper/Mapper.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 19:28:51 2015
New Revision: 1703674

URL: http://svn.apache.org/viewvc?rev=1703674=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58394
Fix data race

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 19:28:51 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

[Bug 58394] Data race on field org.apache.catalina.mapper.Mapper.hosts

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58394

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
Fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703676 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

[markt]

Author: markt
Date: Thu Sep 17 19:47:26 2015
New Revision: 1703676

URL: http://svn.apache.org/viewvc?rev=1703676=rev
Log:
Remove duplicate calls

Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java?rev=1703676=1703675=1703676=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/McastService.java 
Thu Sep 17 19:47:26 2015
@@ -536,7 +536,6 @@ public class McastService implements Mem
 this.payload = payload;
 if ( localMember != null ) {
 localMember.setPayload(payload);
-localMember.getData(true,true);
 try {
 if (impl != null) impl.send(false);
 }catch ( Exception x ) {
@@ -550,7 +549,6 @@ public class McastService implements Mem
 this.domain = domain;
 if ( localMember != null ) {
 localMember.setDomain(domain);
-localMember.getData(true,true);
 try {
 if (impl != null) impl.send(false);
 }catch ( Exception x ) {



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

svn commit: r1703683 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/tribes/membership/McastService.java java/org/apache/catalina/tribes/membership/McastServiceImpl.java

[markt]

Author: markt
Date: Thu Sep 17 20:32:43 2015
New Revision: 1703683

URL: http://svn.apache.org/viewvc?rev=1703683=rev
Log:
Remove some unnecessary code

Modified:
tomcat/tc8.0.x/trunk/   (props changed)

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastService.java

tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 20:32:43 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

[Bug 58395] Data races inside org.apache.catalina.tribes.membership.MemberImpl

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58395

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
No option but to use a fair amount of synchronization for these.

I think I caught everything but I'll be re-running the tests with RV-Predict
once all the issues are fixed so if I missed anything I'll catch it then.

This has been fixed in trunk and 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58396] Data race on field org.apache.tomcat.util.net.NioEndpoint$Poller.nextExpiration

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58396

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #1 from Mark Thomas  ---
This was already fixed in trunk due to the connector clean-up. I've back-ported
tjhe fix to 8.0.x for 8.0.27 onwards.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

svn commit: r1703690 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/NioEndpoint.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Sep 17 21:06:25 2015
New Revision: 1703690

URL: http://svn.apache.org/viewvc?rev=1703690=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58396
Remove some unnecessary code.
This back-ports a small part of the clean-up from trunk

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 21:06:25 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
 
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,137,149,1
 
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-1684527,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,168582
 

[Bug 58427] New: JSP spec out - additional elements in implicit.tld

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58427

Bug ID: 58427
   Summary: JSP spec out - additional elements in implicit.tld
   Product: Tomcat 8
   Version: trunk
  Hardware: PC
OS: Linux
Status: NEW
  Severity: major
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: sungbae_y...@tmax.co.kr

in JSP spec. 

JSP.8.4.3

A JSP 2.1 container must consider only
the JSP version and tlib-version specified by an implicit.tld file, and ignore
its
short-name element. Any additional elements in an implicit.tld file must cause
a
translation error. The JSP version specified in an implicit.tld file

There is no code to check this spec in ImplicitTagLibraryInfo.java
ImplicitTldRuleSet only checks , , ,
doesn't report any error.

and

Do you have any plan to add ExtendedBaseRules in tomcat?
It looks better to use ExtendedBaseRules to fix it in ImplicitTldRuleSet.

Document already have it.(even though it just copy & paste from original
digester doc..)
https://tomcat.apache.org/tomcat-8.0-doc/api/org/apache/tomcat/util/digester/package-summary.html

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58284] StandardSession attempts to silently write NonSerializable objects

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58284

--- Comment #12 from Andrew Shore  ---
Created attachment 33114
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33114=edit
Patch for bug

Had some test failures but I think it's my local setup. Could you run it
through the test suite to make sure it's good.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58425] validate::jk_ajp12_worker.c always returns JK_FALSE.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58425

yagis...@reudo.co.jp changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #3 from yagis...@reudo.co.jp ---
I understand that ajp12 is deprecated and we should use ajp13.

For your reference:
 It seems that ajp12 had still worked somehow until 1.2.40.
 Some code for "source" (I don't know what it is) were added to
validate()::jk_ajp12_worker.c at 1.2.41, and the modification makes validate()
to no longer return JK_TRUE.
 The attached patch can change validate() to return JK_TRUE with the same way
as 1.2.40.

Thanks.

-- 
You are receiving this mail because:
You are the assignee for the bug.

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

[Bug 58425] validate::jk_ajp12_worker.c always returns JK_FALSE.

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=58425

--- Comment #2 from yagis...@reudo.co.jp ---
Created attachment 33115
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=33115=edit
patch for validate()::jk_ajp12_worker.c to return JK_TRUE with the same way as
1.2.40

-- 
You are receiving this mail because:
You are the assignee for the bug.

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