svn commit: r992252 - /tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Author: mturk
Date: Fri Sep  3 10:12:57 2010
New Revision: 992250

URL: http://svn.apache.org/viewvc?rev=992250&view=rev
Log:
Add wrapper over Socket.destroy which will make sure we don't call destory
for sockets already closed by the parent pool cleanup

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...250&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: 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: 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: 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: 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 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 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: 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: 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: Sat Jul 31 14:02:29 2010
New Revision: 981061

URL: http://svn.apache.org/viewvc?rev=981061&view=rev
Log:
Revert r966596 - pollTime is in microseconds, wait is in milliseconds
Add an additional wait that prevents a JVM crash on shutdown detected in
TestAsyncContextImpl tests 

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...061&view=diff

Author: mturk
Date: Fri Sep  3 05:27:24 2010
New Revision: 992211

URL: http://svn.apache.org/viewvc?rev=992211&view=rev
Log:
Join poller and sendfile threads on destroy. This requires to change the
Poller and Sendile to Thread instead Runnable for simplicity.

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...211&view=diff

Author: mturk
Date: Fri Sep  3 04:09:25 2010
New Revision: 992194

URL: http://svn.apache.org/viewvc?rev=992194&view=rev
Log:
Trim trailing spaces. No functional change

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...194&view=diff

Author: mturk
Date: Fri Sep  3 04:26:23 2010
New Revision: 992199

URL: http://svn.apache.org/viewvc?rev=992199&view=rev
Log:
Store the Acceptor instances in the array like we do for other threads

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...199&view=diff

Author: mturk
Date: Fri Sep  3 04:36:46 2010
New Revision: 992200

URL: http://svn.apache.org/viewvc?rev=992200&view=rev
Log:
Make sure we exit the thread if not running. Otherwise the thread will
block in run until the VM shuts down

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...200&view=diff

Author: markt
Date: Thu Aug  5 12:55:15 2010
New Revision: 982589

URL: http://svn.apache.org/viewvc?rev=982589&view=rev
Log:
Code clean up in o.a.t.until.net.jsse
 - @Override
 - import order
 - unused code
 - unnecessary code

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEFactory.java
   
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEKeyManager.java
    tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
   
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/NioX509KeyManager.java

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

Author: rjung
Date: Mon Aug  2 13:08:37 2010
New Revision: 981501

URL: http://svn.apache.org/viewvc?rev=981501&view=rev
Log:
Replace UTF section sign in Javadoc by
HTML entity.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapEntry.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTable.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMap.java
URL:
http://svn.apache.org/viewvc/tomcat/t...501&view=diff

Author: markt
Date: Thu Jun  3 10:02:30 2010
New Revision: 950929

URL: http://svn.apache.org/viewvc?rev=950929&view=rev
Log:
Re-order so it is easier to check all objects are re-cycled

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java

Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/MappingData.java
URL:
http://svn.apache.org/viewvc/tomcat/t...929&view=diff

Author: markt
Date: Sun Aug  1 11:13:10 2010
New Revision: 981203

URL: http://svn.apache.org/viewvc?rev=981203&view=rev
Log:
Update packaged re-named Jakarta BCEL

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/bcel/   (props changed)
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AccessFlags.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationDefault.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/AnnotationEntry.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Annotations.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ElementValuePair.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotationEntry.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ParameterAnnotations.java
   
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/StackMapTableEntry.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Unknown.java
    tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
    tomcat/trunk/webapps/docs/changelog.xml

Propchange: tomcat/trunk/java/org/apache/tomcat/util/bcel/

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