svn commit: r950929 - /tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java

Author: markt
Date: Thu Jun  3 07:50:51 2010
New Revision: 950904

URL: http://svn.apache.org/viewvc?rev=950904&view=rev
Log:
Fix an Eclipse nag

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
URL:
http://svn.apache.org/viewvc/tomcat/t...904&view=diff

Author: markt
Date: Fri Jul  2 21:10:35 2010
New Revision: 960103

URL: http://svn.apache.org/viewvc?rev=960103&view=rev
Log:
Fix FindBugs niggle

Modified:
    tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/http/TestBug49158.java
URL:
http://svn.apache.org/viewvc/tomcat/t...103&view=diff

Author: pero
Date: Sun Jun 27 11:02:10 2010
New Revision: 958362

URL: http://svn.apache.org/viewvc?rev=958362&view=rev
Log:
Start JioEndpoint timeout thread, to handle timeout a AsyncListener.

Added:
    tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java  
(with props)
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...362&view=diff

Author: markt
Date: Sun Jul  4 15:44:45 2010
New Revision: 960348

URL: http://svn.apache.org/viewvc?rev=960348&view=rev
Log:
Revert r958362, r960083, r958406, r960069. r958362 broke the TCK tests and
the other commits were sufficiently tightly coupled to it that it was
easier to revert all of them than try to unpick them.

Removed:
    tomcat/trunk/test/org/apache/catalina/core/TestAsyncListener.java
Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...348&view=diff

I am highly interessed why does my fix is wrong :-)

Is my fix really wrong, you can revert my checkin. Today I present the  
new Tomcat 7 release at Java User Forum Stuttgart (Germany).

Many thanks,

Peter

Am 01.07.2010 um 08:20 schrieb jean-frederic clere:

 On 06/30/2010 09:15 PM, Peter Roßbach wrote:
> Hi Jean Frederic!
>
> Why does my change break the TCK? Is the current 12/09 servlet
spec  
> not
> correct? How must the async timeout functionalty work?
>
> Can you comment my other findings, please?

 I will have a look today to the stuff.

 Cheers

 Jean-Frederic

Author: kkolinko
Date: Thu Jun  3 01:33:08 2010
New Revision: 950851

URL: http://svn.apache.org/viewvc?rev=950851&view=rev
Log:
Prevent possible deadlocks in AprEndpoint.Poller and AprEndpoint.Sendfile,
caused by missing Object.notify() wakeup,
which is similar to
https://issues.apache.org/bugzilla/show_bug.cgi?id=48843

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...851&view=diff

Author: markt
Date: Thu Jul 22 11:51:00 2010
New Revision: 966596

URL: http://svn.apache.org/viewvc?rev=966596&view=rev
Log:
Poll time and wait are both in milliseconds

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...596&view=diff

Author: markt
Date: Tue Jul 27 20:27:16 2010
New Revision: 979852

URL: http://svn.apache.org/viewvc?rev=979852&view=rev
Log:
Only need to wait a single pollTime, not one pollTime for each poller.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...852&view=diff

Author: markt
Date: Tue May 25 12:50:19 2010
New Revision: 948028

URL: http://svn.apache.org/viewvc?rev=948028&view=rev
Log:
Remove duplicate code

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...028&view=diff

Author: markt
Date: Tue Jul 27 20:56:10 2010
New Revision: 979865

URL: http://svn.apache.org/viewvc?rev=979865&view=rev
Log:
Fix unit test failure. Ignore exceptions when destroying APR connector if
APR was never initialised.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...865&view=diff

Author: markt
Date: Tue Jul 27 21:05:16 2010
New Revision: 979872

URL: http://svn.apache.org/viewvc?rev=979872&view=rev
Log:
Code clean-up
Remove deps on o.a.catalina
Fix a couple of Eclipse nags

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...872&view=diff

Author: kkolinko
Date: Wed Jun  2 17:34:55 2010
New Revision: 950682

URL: http://svn.apache.org/viewvc?rev=950682&view=rev
Log:
Followup to r948043 that was a fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
We should not use PrintWriter(OutputStream), because that implicitly uses
the platform default charset. Specify the charset explicitly.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...682&view=diff

Author: markt
Date: Tue Jul 27 22:36:06 2010
New Revision: 979896

URL: http://svn.apache.org/viewvc?rev=979896&view=rev
Log:
More unit test fixes - better handling when APR/native connector is not
started

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...896&view=diff

Author: markt
Date: Sat Jul 10 21:22:12 2010
New Revision: 962919

URL: http://svn.apache.org/viewvc?rev=962919&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49442
Trivial code clean-up. No functional change.
Based on a patch provided by Sebb.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java
URL:
http://svn.apache.org/viewvc/tomcat/t...919&view=diff

Author: markt
Date: Fri Jul  2 17:50:56 2010
New Revision: 960069

URL: http://svn.apache.org/viewvc?rev=960069&view=rev
Log:
Make new timeout thread a daemon thread so Tomcat will shutdown properly

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...069&view=diff

Author: markt
Date: Tue May 25 13:53:14 2010
New Revision: 948043

URL: http://svn.apache.org/viewvc?rev=948043&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49095
AprEndpoint does not wakeup accepts with deferred accept or BSD filters
Based on a patch provided by Ruediger Pluem

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/t...043&view=diff

Author: costin
Date: Tue May 25 06:21:36 2010
New Revision: 947933

URL: http://svn.apache.org/viewvc?rev=947933&view=rev
Log:
Broken, not used. Source in o.a.t.util.buf was removed as well. 

Removed:
   
tomcat/trunk/modules/tomcat-lite/java/org/apache/tomcat/lite/util/Base64.java

Author: markt
Date: Sun Jun  6 21:50:11 2010
New Revision: 952000

URL: http://svn.apache.org/viewvc?rev=952000&view=rev
Log:
Make syncs consistent

Modified:
    tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java

Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/t...000&view=diff

Author: kkolinko
Date: Mon Jun  7 15:41:40 2010
New Revision: 952276

URL: http://svn.apache.org/viewvc?rev=952276&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49398
Fixes behaviour of ByteChunk.indexOf(String..) when the string argument is
of length 1.

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
   
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/buf/ByteChunk.java
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/t...276&view=diff

Author: kkolinko
Date: Mon Jun  7 15:34:12 2010
New Revision: 952275

URL: http://svn.apache.org/viewvc?rev=952275&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49398
Fixes behaviour of ByteChunk.indexOf(String..) when the string argument is
of length 1.

It is backport of r945231 from trunk

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/ByteChunk.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/