Re: [VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Mark Thomas 
On 22/11/2019 20:14, Konstantin Kolinko wrote:
> пт, 22 нояб. 2019 г. в 16:19, Violeta Georgieva :
>>
>> The proposed Apache Tomcat 7.0.98 release is now available for voting.
>>
>> It can be obtained from:
>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.98/
>> The Maven staging repo is:
>> https://repository.apache.org/content/repositories/orgapachetomcat-1239/
>> The git tag is:
>> https://github.com/apache/tomcat/tree/7.0.98
>> fde40d7e0c7a1b0b2423cb84ad220a5d98b65591
>>
>> The proposed 7.0.98 release is:
>> [x] Broken - do not release
>> [ ] Stable - go ahead and release as 7.0.98 Stable
> 
> Unfortunately, it is broken.
> Testing on Windows 10,
> the test "org.apache.catalina.core.TestAsyncContextStateChanges"
> always hangs for an APR connector, regardless of version of Java
> - tested 32-bit native with 32-bit Oracle Java 6u45, 7u80
> - tested 64-bit native with 64-bit Java 8u222 from AdoptOpenJDK, Java
> 13 from OpenJDK.
> 
> For NIO and BIO connectors the same test completes successfully in 13 seconds.
> 
> It appears to be the same issue as was filed earlier today by Michael
> who was testing on FreeBSD,
> https://bz.apache.org/bugzilla/show_bug.cgi?id=63950

I'm starting to dig into this. At the moment, my investigation is
focussed on the APR Poller.

Mark

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

[Bug 63832] Unable to stop because WebappClassLoaderBase.checkThreadLocalMapForLeaks can't load class(class from deployed aplication - probably undeployed)

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63832

Daniel Charczyński  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #5 from Daniel Charczyński  ---
It looks like problem is not solved...

Current stacktrace on version 8.5.49

25-Nov-2019 11:15:37.790 SEVERE [Catalina-startStop-2]
org.apache.catalina.core.ContainerBase.stopInternal A child container failed
during stop
java.util.concurrent.ExecutionException: java.lang.InternalError:
Malformed class name
at java.util.concurrent.FutureTask.report(FutureTask.java:122)
at java.util.concurrent.FutureTask.get(FutureTask.java:192)
at
org.apache.catalina.core.ContainerBase.stopInternal(ContainerBase.java:990)
at
org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:257)
at
org.apache.catalina.core.ContainerBase$StopChild.call(ContainerBase.java:1428)
at
org.apache.catalina.core.ContainerBase$StopChild.call(ContainerBase.java:1417)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)
Caused by: java.lang.InternalError: Malformed class name
at java.lang.Class.getSimpleName(Class.java:1330)
at java.lang.Class.getCanonicalName(Class.java:1399)
at
org.apache.catalina.loader.WebappClassLoaderBase.getPrettyClassName(WebappClassLoaderBase.java:2049)
at
org.apache.catalina.loader.WebappClassLoaderBase.checkThreadLocalMapForLeaks(WebappClassLoaderBase.java:2013)
at
org.apache.catalina.loader.WebappClassLoaderBase.checkThreadLocalsForLeaks(WebappClassLoaderBase.java:1941)
at
org.apache.catalina.loader.WebappClassLoaderBase.clearReferences(WebappClassLoaderBase.java:1610)
at
org.apache.catalina.loader.WebappClassLoaderBase.stop(WebappClassLoaderBase.java:1550)
at
org.apache.catalina.loader.WebappLoader.stopInternal(WebappLoader.java:446)
at
org.apache.catalina.util.LifecycleBase.stop(LifecycleBase.java:257)
at
org.apache.catalina.core.StandardContext.stopInternal(StandardContext.java:5439)
... 7 more

-- 
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 63832] Unable to stop because WebappClassLoaderBase.checkThreadLocalMapForLeaks can't load class(class from deployed aplication - probably undeployed)

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63832

Remy Maucherat  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|REOPENED|RESOLVED

--- Comment #6 from Remy Maucherat  ---
The issue should be fixed: it is about not stopping and cleaning up properly.
As I said before: The root cause was that the container state was not properly
set to FAILED on a JVM error exception class.

The "root cause" is of course not fixed, since it is a classloader problem most
likely caused by your application. It is logged and things will go on from
there. Feel free to investigate about it on the user mailing list, but please
do not reopen the report for now.

-- 
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

Re: [VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Mark Thomas 
On 25/11/2019 10:44, Mark Thomas wrote:
> On 22/11/2019 20:14, Konstantin Kolinko wrote:
>> пт, 22 нояб. 2019 г. в 16:19, Violeta Georgieva :
>>>
>>> The proposed Apache Tomcat 7.0.98 release is now available for voting.
>>>
>>> It can be obtained from:
>>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.98/
>>> The Maven staging repo is:
>>> https://repository.apache.org/content/repositories/orgapachetomcat-1239/
>>> The git tag is:
>>> https://github.com/apache/tomcat/tree/7.0.98
>>> fde40d7e0c7a1b0b2423cb84ad220a5d98b65591
>>>
>>> The proposed 7.0.98 release is:
>>> [x] Broken - do not release
>>> [ ] Stable - go ahead and release as 7.0.98 Stable
>>
>> Unfortunately, it is broken.
>> Testing on Windows 10,
>> the test "org.apache.catalina.core.TestAsyncContextStateChanges"
>> always hangs for an APR connector, regardless of version of Java
>> - tested 32-bit native with 32-bit Oracle Java 6u45, 7u80
>> - tested 64-bit native with 64-bit Java 8u222 from AdoptOpenJDK, Java
>> 13 from OpenJDK.
>>
>> For NIO and BIO connectors the same test completes successfully in 13 
>> seconds.
>>
>> It appears to be the same issue as was filed earlier today by Michael
>> who was testing on FreeBSD,
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=63950
> 
> I'm starting to dig into this. At the moment, my investigation is
> focussed on the APR Poller.

Found it. It is a bug in the unit test. The client is closing the
connection too soon. I'm not sure why we are seeing this on a subset of
operating systems and a subset of versions but I'll get it fixed generally.

Mark

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

[tomcat] branch master updated: Fix potential test failure / hang if timing isn't as expected

2019-11-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new e160e53  Fix potential test failure / hang if timing isn't as expected
e160e53 is described below

commit e160e5343f70dbac23e2771303c1a1573d0dd152
Author: Mark Thomas 
AuthorDate: Mon Nov 25 11:36:33 2019 +

Fix potential test failure / hang if timing isn't as expected
---
 test/org/apache/catalina/core/TestAsyncContextStateChanges.java | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java 
b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
index 90f8521..f909484 100644
--- a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
+++ b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
@@ -76,6 +76,7 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 private ServletRequest servletRequest = null;
 private AsyncContext asyncContext = null;
 private AtomicBoolean failed = new AtomicBoolean();
+private CountDownLatch servletLatch;
 private CountDownLatch threadLatch;
 private CountDownLatch closeLatch;
 private CountDownLatch endLatch;
@@ -89,6 +90,7 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 
 // Initialise tracking fields
 failed.set(true);
+servletLatch = new CountDownLatch(1);
 threadLatch = new CountDownLatch(1);
 closeLatch = new CountDownLatch(1);
 endLatch = new CountDownLatch(1);
@@ -114,6 +116,9 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 client.connect();
 client.sendRequest();
 
+// Wait for Servlet to start processing request
+servletLatch.await();
+
 if (asyncEnd.isError()) {
 client.disconnect();
 closeLatch.countDown();
@@ -147,6 +152,8 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+servletLatch.countDown();
+
 if (dispatch) {
 return;
 }


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

[tomcat] branch 8.5.x updated: Fix potential test failure / hang if timing isn't as expected

2019-11-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 2fedebf  Fix potential test failure / hang if timing isn't as expected
2fedebf is described below

commit 2fedebf15958fec037e036b94f8895a3bd0d2df2
Author: Mark Thomas 
AuthorDate: Mon Nov 25 11:36:33 2019 +

Fix potential test failure / hang if timing isn't as expected
---
 test/org/apache/catalina/core/TestAsyncContextStateChanges.java | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java 
b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
index 90f8521..f909484 100644
--- a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
+++ b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
@@ -76,6 +76,7 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 private ServletRequest servletRequest = null;
 private AsyncContext asyncContext = null;
 private AtomicBoolean failed = new AtomicBoolean();
+private CountDownLatch servletLatch;
 private CountDownLatch threadLatch;
 private CountDownLatch closeLatch;
 private CountDownLatch endLatch;
@@ -89,6 +90,7 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 
 // Initialise tracking fields
 failed.set(true);
+servletLatch = new CountDownLatch(1);
 threadLatch = new CountDownLatch(1);
 closeLatch = new CountDownLatch(1);
 endLatch = new CountDownLatch(1);
@@ -114,6 +116,9 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 client.connect();
 client.sendRequest();
 
+// Wait for Servlet to start processing request
+servletLatch.await();
+
 if (asyncEnd.isError()) {
 client.disconnect();
 closeLatch.countDown();
@@ -147,6 +152,8 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+servletLatch.countDown();
+
 if (dispatch) {
 return;
 }


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

[tomcat] branch master updated: may sure the arbitrarily assigned user ID of openshift can deploy a war file.

2019-11-25 Thread jfclere 
This is an automated email from the ASF dual-hosted git repository.

jfclere pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new a42b94a  may sure the arbitrarily assigned user ID of openshift can 
deploy a war file.
a42b94a is described below

commit a42b94a042414a98beb600c22a9af08d938baf52
Author: Jean-Frederic Clere 
AuthorDate: Mon Nov 25 13:22:58 2019 +0100

may sure the arbitrarily assigned user ID of openshift can deploy a war 
file.
---
 res/tomcat-maven/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/tomcat-maven/Dockerfile b/res/tomcat-maven/Dockerfile
index 5570391..512f232 100644
--- a/res/tomcat-maven/Dockerfile
+++ b/res/tomcat-maven/Dockerfile
@@ -23,6 +23,7 @@ RUN mkdir -m 777 -p /deployments
 ADD target/tomcat-maven-1.0.jar /deployments/app.jar
 ADD conf /deployments/conf
 ADD webapps /deployments/webapps
+RUN chmod 777 /deployments/webapps
 
 WORKDIR /deployments
 


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

[Bug 62611] Compress log files after rotation

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=62611

--- Comment #7 from habuzahra  ---
Hello ,

I had pulled the changes to the under Log compression #223 to the tomcat githup
repository , but there was no review. any Idea .

-- 
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

[tomcat] branch 7.0.x updated: Fix potential test failure / hang if timing isn't as expected

2019-11-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 609d102  Fix potential test failure / hang if timing isn't as expected
609d102 is described below

commit 609d10230ad1cb67c9745764ccee98450df89880
Author: Mark Thomas 
AuthorDate: Mon Nov 25 11:36:33 2019 +

Fix potential test failure / hang if timing isn't as expected
---
 test/org/apache/catalina/core/TestAsyncContextStateChanges.java | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java 
b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
index 9c7e723..3e5cb46 100644
--- a/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
+++ b/test/org/apache/catalina/core/TestAsyncContextStateChanges.java
@@ -85,6 +85,7 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 private ServletRequest servletRequest = null;
 private AsyncContext asyncContext = null;
 private AtomicBoolean failed = new AtomicBoolean();
+private CountDownLatch servletLatch;
 private CountDownLatch threadLatch;
 private CountDownLatch closeLatch;
 private CountDownLatch endLatch;
@@ -98,6 +99,7 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 
 // Initialise tracking fields
 failed.set(true);
+servletLatch = new CountDownLatch(1);
 threadLatch = new CountDownLatch(1);
 closeLatch = new CountDownLatch(1);
 endLatch = new CountDownLatch(1);
@@ -123,6 +125,9 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 client.connect();
 client.sendRequest();
 
+// Wait for Servlet to start processing request
+servletLatch.await();
+
 if (asyncEnd.isError()) {
 client.disconnect();
 closeLatch.countDown();
@@ -155,6 +160,8 @@ public class TestAsyncContextStateChanges extends 
TomcatBaseTest {
 @Override
 protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 throws ServletException, IOException {
+servletLatch.countDown();
+
 if (dispatch) {
 return;
 }


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

[Bug 63950] org.apache.catalina.core.TestAsyncContextStateChanges with APR blocks forever on FreeBSD

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63950

--- Comment #6 from Michael Osipov  ---
609d10230ad1cb67c9745764ccee98450df89880 fixes the issue for me.

-- 
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

Re: [VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Rémy Maucherat 
On Mon, Nov 25, 2019 at 12:30 PM Mark Thomas  wrote:

> On 25/11/2019 10:44, Mark Thomas wrote:
> > On 22/11/2019 20:14, Konstantin Kolinko wrote:
> >> пт, 22 нояб. 2019 г. в 16:19, Violeta Georgieva :
> >>>
> >>> The proposed Apache Tomcat 7.0.98 release is now available for voting.
> >>>
> >>> It can be obtained from:
> >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.98/
> >>> The Maven staging repo is:
> >>>
> https://repository.apache.org/content/repositories/orgapachetomcat-1239/
> >>> The git tag is:
> >>> https://github.com/apache/tomcat/tree/7.0.98
> >>> fde40d7e0c7a1b0b2423cb84ad220a5d98b65591
> >>>
> >>> The proposed 7.0.98 release is:
> >>> [x] Broken - do not release
> >>> [ ] Stable - go ahead and release as 7.0.98 Stable
> >>
> >> Unfortunately, it is broken.
> >> Testing on Windows 10,
> >> the test "org.apache.catalina.core.TestAsyncContextStateChanges"
> >> always hangs for an APR connector, regardless of version of Java
> >> - tested 32-bit native with 32-bit Oracle Java 6u45, 7u80
> >> - tested 64-bit native with 64-bit Java 8u222 from AdoptOpenJDK, Java
> >> 13 from OpenJDK.
> >>
> >> For NIO and BIO connectors the same test completes successfully in 13
> seconds.
> >>
> >> It appears to be the same issue as was filed earlier today by Michael
> >> who was testing on FreeBSD,
> >> https://bz.apache.org/bugzilla/show_bug.cgi?id=63950
> >
> > I'm starting to dig into this. At the moment, my investigation is
> > focussed on the APR Poller.
>
> Found it. It is a bug in the unit test. The client is closing the
> connection too soon. I'm not sure why we are seeing this on a subset of
> operating systems and a subset of versions but I'll get it fixed generally.
>
> It would seem the 7.0.98 build got dropped a bit too early then, can it be
brought back ?

Rémy

Re: [tomcat] branch master updated: may sure the arbitrarily assigned user ID of openshift can deploy a war file.

2019-11-25 Thread Konstantin Kolinko 
пн, 25 нояб. 2019 г. в 15:24, :
>
> This is an automated email from the ASF dual-hosted git repository.
>
> jfclere pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
>  new a42b94a  may sure the arbitrarily assigned user ID of openshift can 
> deploy a war file.
> a42b94a is described below
>
> --- a/res/tomcat-maven/Dockerfile
> +++ b/res/tomcat-maven/Dockerfile
> @@ -23,6 +23,7 @@ RUN mkdir -m 777 -p /deployments
>  ADD target/tomcat-maven-1.0.jar /deployments/app.jar
>  ADD conf /deployments/conf
>  ADD webapps /deployments/webapps
> +RUN chmod 777 /deployments/webapps

World-writable? Any other way to solve the issue?

The following document [1] (found by Googling):
tells to change directories ownership to group 0 (root) and make the
files writable by that group.
--
RUN chgrp -R 0 /some/directory && \
chmod -R g=u /some/directory
---
(Set owning group id to be 0, recursively (-R).
Set group permissions recursively (-R) to be a copy (=) of the user's
permissions.)

[1] 
https://docs.openshift.com/container-platform/3.11/creating_images/guidelines.html#use-uid
"OpenShift > 3.11 > Creating Images > Guidelines"
section "Support Arbitrary User IDs"

Best regards,
Konstantin Kolinko

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

Re: [tomcat] branch master updated: may sure the arbitrarily assigned user ID of openshift can deploy a war file.

2019-11-25 Thread Rémy Maucherat 
On Mon, Nov 25, 2019 at 2:46 PM Konstantin Kolinko 
wrote:

> пн, 25 нояб. 2019 г. в 15:24, :
> >
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > jfclere pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/master by this push:
> >  new a42b94a  may sure the arbitrarily assigned user ID of openshift
> can deploy a war file.
> > a42b94a is described below
> >
> > --- a/res/tomcat-maven/Dockerfile
> > +++ b/res/tomcat-maven/Dockerfile
> > @@ -23,6 +23,7 @@ RUN mkdir -m 777 -p /deployments
> >  ADD target/tomcat-maven-1.0.jar /deployments/app.jar
> >  ADD conf /deployments/conf
> >  ADD webapps /deployments/webapps
> > +RUN chmod 777 /deployments/webapps
>
> World-writable? Any other way to solve the issue?
>

Why does it matter ? It has to be writable by Tomcat and it is the only
process that will be running, so it's already world writable.
Note: it worked fine in Docker without it, so these container platforms
differences are new to me.

Rémy


>
> The following document [1] (found by Googling):
> tells to change directories ownership to group 0 (root) and make the
> files writable by that group.
> --
> RUN chgrp -R 0 /some/directory && \
> chmod -R g=u /some/directory
> ---
> (Set owning group id to be 0, recursively (-R).
> Set group permissions recursively (-R) to be a copy (=) of the user's
> permissions.)
>
> [1]
> https://docs.openshift.com/container-platform/3.11/creating_images/guidelines.html#use-uid
> "OpenShift > 3.11 > Creating Images > Guidelines"
> section "Support Arbitrary User IDs"
>
> Best regards,
> Konstantin Kolinko
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: [VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Violeta Georgieva 
На пн, 25.11.2019 г. в 15:38 Rémy Maucherat  написа:
>
> On Mon, Nov 25, 2019 at 12:30 PM Mark Thomas  wrote:
>>
>> On 25/11/2019 10:44, Mark Thomas wrote:
>> > On 22/11/2019 20:14, Konstantin Kolinko wrote:
>> >> пт, 22 нояб. 2019 г. в 16:19, Violeta Georgieva :
>> >>>
>> >>> The proposed Apache Tomcat 7.0.98 release is now available for
voting.
>> >>>
>> >>> It can be obtained from:
>> >>> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.98/
>> >>> The Maven staging repo is:
>> >>>
https://repository.apache.org/content/repositories/orgapachetomcat-1239/
>> >>> The git tag is:
>> >>> https://github.com/apache/tomcat/tree/7.0.98
>> >>> fde40d7e0c7a1b0b2423cb84ad220a5d98b65591
>> >>>
>> >>> The proposed 7.0.98 release is:
>> >>> [x] Broken - do not release
>> >>> [ ] Stable - go ahead and release as 7.0.98 Stable
>> >>
>> >> Unfortunately, it is broken.
>> >> Testing on Windows 10,
>> >> the test "org.apache.catalina.core.TestAsyncContextStateChanges"
>> >> always hangs for an APR connector, regardless of version of Java
>> >> - tested 32-bit native with 32-bit Oracle Java 6u45, 7u80
>> >> - tested 64-bit native with 64-bit Java 8u222 from AdoptOpenJDK, Java
>> >> 13 from OpenJDK.
>> >>
>> >> For NIO and BIO connectors the same test completes successfully in 13
seconds.
>> >>
>> >> It appears to be the same issue as was filed earlier today by Michael
>> >> who was testing on FreeBSD,
>> >> https://bz.apache.org/bugzilla/show_bug.cgi?id=63950
>> >
>> > I'm starting to dig into this. At the moment, my investigation is
>> > focussed on the APR Poller.
>>
>> Found it. It is a bug in the unit test. The client is closing the
>> connection too soon. I'm not sure why we are seeing this on a subset of
>> operating systems and a subset of versions but I'll get it fixed
generally.
>>
> It would seem the 7.0.98 build got dropped a bit too early then, can it
be brought back ?


We have the tag so I can rebuild it and upload it again.

Is that OK?

Regards,
Violeta

[tomcat] branch 7.0.x updated: BZ 63950 - Add changelog entry.

2019-11-25 Thread kkolinko 
This is an automated email from the ASF dual-hosted git repository.

kkolinko pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new 4a928c0  BZ 63950 - Add changelog entry.
4a928c0 is described below

commit 4a928c01dc9db25fb5601b8c4800c7f5b617b247
Author: Konstantin Kolinko 
AuthorDate: Mon Nov 25 17:15:06 2019 +0300

BZ 63950 - Add changelog entry.

The issue with hanging TestAsyncContextStateChanges test was fixed by 
commit 609d10230ad1cb67c9745764ccee98450df89880.
---
 webapps/docs/changelog.xml | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 447593f..ffb28e7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -59,6 +59,17 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
+
+  
+
+  
+63950: Fix timing issue in
+TestAsyncContextStateChanges test that caused it
+to hang indefinitely. (markt)
+  
+
+  
+
 
   
 


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

[Bug 63950] org.apache.catalina.core.TestAsyncContextStateChanges with APR blocks forever on FreeBSD

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63950

Konstantin Kolinko  changed:

   What|Removed |Added

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

--- Comment #7 from Konstantin Kolinko  ---
Mark wrote in "[VOTE] Release Apache Tomcat 7.0.98" thread

> Found it. It is a bug in the unit test. The client is closing the
> connection too soon. I'm not sure why we are seeing this on a subset of
> operating systems and a subset of versions but I'll get it fixed generally.

(In reply to Michael Osipov from comment #6)
> 609d10230ad1cb67c9745764ccee98450df89880 fixes the issue for me.

I confirm as well.
That commit fixes the issue for me as well, on Windows 10.

I updated the changelog file. I am closing this issue as FIXED.

-- 
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 63815] Expansion of JAVA_OPTS in catalina.sh containing '*' stops startup on linux

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

Mark Thomas  changed:

   What|Removed |Added

 Resolution|FIXED   |---
 Status|RESOLVED|REOPENED

--- Comment #9 from Mark Thomas  ---
This fix triggered a regression in tool-wrapper.sh and daemon.sh. catalina.sh
was not impacted due to the use of eval in that script.

I'm working on a fix.

-- 
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 63950] org.apache.catalina.core.TestAsyncContextStateChanges with APR blocks forever on FreeBSD

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63950

--- Comment #8 from Mark Thomas  ---
Thanks for the confirmations and updating the bug. I was just waiting to
complete a full unit test run for 9.0.x, 8.5.x and 7.0.x before updating. They
have just finished. All looks 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 63815] Expansion of JAVA_OPTS in catalina.sh containing '*' stops startup on linux

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

--- Comment #10 from Mark Thomas  ---
Konstantin was right in comment #2. I missed it because I only tested code
paths where eval was used. All the code paths that don't use eval are now
broken.

-- 
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

Re: [VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Mark Thomas 
On 25/11/2019 14:05, Violeta Georgieva wrote:
> На пн, 25.11.2019 г. в 15:38 Rémy Maucherat 

>> It would seem the 7.0.98 build got dropped a bit too early then, can
>> it be brought back ?
> 
> 
> We have the tag so I can rebuild it and upload it again.
> 
> Is that OK?

Generally, yes. In this instance I'd really like an opportunity to fix
the regression caused by my fix for BZ 63815. I'm currently researching
options but should be complete later today.

Mark

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

Re: [VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Violeta Georgieva 
На пн, 25.11.2019 г. в 17:52 Mark Thomas  написа:
>
> On 25/11/2019 14:05, Violeta Georgieva wrote:
> > На пн, 25.11.2019 г. в 15:38 Rémy Maucherat 
> 
>
> >> It would seem the 7.0.98 build got dropped a bit too early then, can
> >> it be brought back ?
> >
> >
> > We have the tag so I can rebuild it and upload it again.
> >
> > Is that OK?
>
> Generally, yes. In this instance I'd really like an opportunity to fix
> the regression caused by my fix for BZ 63815. I'm currently researching
> options but should be complete later today.


Ok
I'll wait for that fix and then I'll prepare 7.0.99 for voting.

Regards,
Violeta

[tomcat] branch master updated: Simplify regular endpoint writes by removing write(Non)BlockingDirect

2019-11-25 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 33eccc7  Simplify regular endpoint writes by removing 
write(Non)BlockingDirect
33eccc7 is described below

commit 33eccc77048bd15131f8f9f5d95720399719952a
Author: remm 
AuthorDate: Mon Nov 25 17:44:00 2019 +0100

Simplify regular endpoint writes by removing write(Non)BlockingDirect

The performance difference is null on what I exercised (static files).
However, this removes code and makes buffering behavior consistent,
avoiding a possible issue mentioned in the fixme (small writes causing a
performance degradation).
Following this I don't find any additional interesting cleanup. After
testing to verify things are not broken, I will work on backporting to
8.5 piece by piece.
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   | 51 
 .../apache/tomcat/util/net/SocketWrapperBase.java  | 96 --
 webapps/docs/changelog.xml |  5 ++
 3 files changed, 22 insertions(+), 130 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index 10322da..ebfd51b 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2250,57 +2250,6 @@ public class AprEndpoint extends 
AbstractEndpoint implements SNICallB
 
 
 @Override
-protected void writeBlockingDirect(ByteBuffer from) throws IOException 
{
-if (from.isDirect()) {
-super.writeBlockingDirect(from);
-} else {
-// The socket write buffer capacity is socket.appWriteBufSize
-ByteBuffer writeBuffer = socketBufferHandler.getWriteBuffer();
-int limit = writeBuffer.capacity();
-while (from.remaining() >= limit) {
-socketBufferHandler.configureWriteBufferForWrite();
-transfer(from, writeBuffer);
-doWrite(true);
-}
-
-if (from.remaining() > 0) {
-socketBufferHandler.configureWriteBufferForWrite();
-transfer(from, writeBuffer);
-}
-}
-}
-
-
-@Override
-protected void writeNonBlockingDirect(ByteBuffer from) throws 
IOException {
-if (from.isDirect()) {
-super.writeNonBlockingDirect(from);
-} else {
-// The socket write buffer capacity is socket.appWriteBufSize
-ByteBuffer writeBuffer = socketBufferHandler.getWriteBuffer();
-int limit = writeBuffer.capacity();
-while (from.remaining() >= limit) {
-socketBufferHandler.configureWriteBufferForWrite();
-transfer(from, writeBuffer);
-int newPosition = writeBuffer.position() + limit;
-doWrite(false);
-if (writeBuffer.position() != newPosition) {
-// Didn't write the whole amount of data in the last
-// non-blocking write.
-// Exit the loop.
-return;
-}
-}
-
-if (from.remaining() > 0) {
-socketBufferHandler.configureWriteBufferForWrite();
-transfer(from, writeBuffer);
-}
-}
-}
-
-
-@Override
 protected void doWrite(boolean block, ByteBuffer from) throws 
IOException {
 Lock readLock = getBlockingStatusReadLock();
 WriteLock writeLock = getBlockingStatusWriteLock();
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index e81eb26..777276d 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -531,7 +531,7 @@ public abstract class SocketWrapperBase {
 protected void writeBlocking(byte[] buf, int off, int len) throws 
IOException {
 socketBufferHandler.configureWriteBufferForWrite();
 int thisTime = transfer(buf, off, len, 
socketBufferHandler.getWriteBuffer());
-while (socketBufferHandler.getWriteBuffer().remaining() == 0) {
+while (!socketBufferHandler.getWriteBuffer().hasRemaining()) {
 len = len - thisTime;
 off = off + thisTime;
 doWrite(true);
@@ -555,46 +555,10 @@ public abstract class SocketWrapperBase {
  * @throws IOException If an IO error occurs during the write
  */
 protected void writeBlocking(ByteBuffer from) throws IOException {
-if (socketBufferHandler.isWrit

Re: [OT][VOTE] Release Apache Tomcat 7.0.98

2019-11-25 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

All,

On 11/25/19 11:16, Violeta Georgieva wrote:
> 
> 
> На пн, 25.11.2019 г. в 17:52 Mark Thomas  > написа:
>> 
>> On 25/11/2019 14:05, Violeta Georgieva wrote:
>>> На пн, 25.11.2019 г. в 15:38 Rémy Maucherat  
>> 
>> 
>> 
 It would seem the 7.0.98 build got dropped a bit too early
 then, can it be brought back ?
>>> 
>>> 
>>> We have the tag so I can rebuild it and upload it again.
>>> 
>>> Is that OK?
>> 
>> Generally, yes. In this instance I'd really like an opportunity
>> to fix the regression caused by my fix for BZ 63815. I'm
>> currently researching options but should be complete later
>> today.
> 
> 
> Ok I'll wait for that fix and then I'll prepare 7.0.99 for voting.

I realize that this happened a long time ago and that the number 100
is just an arbitrary line in the sand, but this is the highest release
number any version of Tomcat has ever gotten.

- From past releases:

Major   Highest Patch Version   7.0 Surpasses
6.0 .53 2014-05-22 (~4 years)
5.5 .36 2013-02-18 (~2.5 years)
5.0 .30 2012-10-09 (~2 years)
4.1 .40 2013-06-10 (~3 years)
4.0 .06 2011-02-05 (~.5 years)

I see this as a very encouraging non-milestone: Tomcat 7.0 was
initially released back in June of 2010, and it has continued to get
fixes and updates nearly 10 years after initial release. I think
that's a great story.

Tomcat 6.0 had a similar story, with 6.0.10[1] being the first stable
version released on 2007-02-28 and final release on 2017-04-07 --
which I recall was a release done months after the official EOL for
Tomcat 6.0 due to a particularly bad security issue.

If indeed Tomcat 7.0.10 was the first stable version, released
2011-01-14, then we only have 14 months to surpass the lifetime of
that venerable version of Tomcat.

- -chris

[1] Per Wikipedia https://en.wikipedia.org/wiki/Apache_Tomcat#Releases
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAl3cBYAACgkQHPApP6U8
pFh6yBAArhN4UCvZ0emnPUvlt6h4KIzj9eqOiZ0GqArlTgcMk3i/OBVfXsI3q22G
lcGSLDtXknmW3cstzHEQcMyW7tqMD+AF0YaMQ/UtufGt0wUOI4cDVUU+75gEcRg1
ihumey6H/PwOBQmK4GsJoaxOqe8bzPQzwOxocUM71juLfk9g29tBKdBrz7LpJxi3
wGwcWRgiLBmwmOAoPjg4NJYg3incFgssJGbFiY0b9VIo/HrrCPiQ1+OiQanIY6NE
q/W4uj+io2UrXSWcAUuMwhazkpq86u/QENhlMVvbC915ppQlV4j8gS96CLI4Sp2J
e4Tw5VPuTVN+2QBuvkOKRwzZvuxBaUupKey4c8zzUCnT1puzWUndREnE35Wirtar
1naZZzZoiZivGpMrAuDMt+7D3fPznv0BCHktg8PlMsrAyLA9WWTGZbfBowI1W9we
ShWF2K1Ifld1ZDM3QP05nmCWYcgsYe/AqDwzymyQpT84frIxt1GBMORu++2y3jUC
g2Zy4HRIKIE+GR8BjtsR+fii9d2dOTjlGDcIADI9FsQGucoqUfvfhfH4cXU68mSh
vBK1wfRa9iDE8NK/ECzSTp9o4CJ0ciswePrVgw5Q9ABxSCMMSmn9WPQaB2J96sZO
HOH1ObB9AzHX4rZyKVC9Tno1RKFKfXn7FZ7z4zfB2ZLsGVcueWU=
=YLie
-END PGP SIGNATURE-

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

[GitHub] [tomcat] michael-o commented on a change in pull request #225: BZ 63681: Introduce RealmBase#authenticate(GSSName, GSSCredential) an…

2019-11-25 Thread GitBox 
michael-o commented on a change in pull request #225: BZ 63681: Introduce 
RealmBase#authenticate(GSSName, GSSCredential) an…
URL: https://github.com/apache/tomcat/pull/225#discussion_r350383282
 
 

 ##
 File path: java/org/apache/catalina/Realm.java
 ##
 @@ -116,6 +118,17 @@ public Principal authenticate(String username, String 
digest,
 public Principal authenticate(GSSContext gssContext, boolean storeCreds);
 
 
+/**
+ * Try to authenticate using a {@link GSSName}
+ *
+ * @param gssName The {@link GSSName} of the principal to look up
+ * @param gssCredential The {@link GSSCredential} of the principal, may be
+ *  {@code null}
+ * @return the associated principal, or {@code null} if there is none
+ */
+public Principal authenticate(GSSName gssName, GSSCredential 
gssCredential);
+
 
 Review comment:
   @markt-asf So you think that even with the fact above this cannot be 
reasonably added to 8.5+ w/o breaking the API?!


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[tomcat] branch master updated: Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

2019-11-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new fba885d  Revert the fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
fba885d is described below

commit fba885db6191d60224f9621449dd5f036988c777
Author: Mark Thomas 
AuthorDate: Mon Nov 25 20:44:37 2019 +

Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

This triggered various regressions, particularly with daemon.sh
---
 bin/catalina.sh| 16 
 bin/daemon.sh  |  4 ++--
 bin/tool-wrapper.sh|  2 +-
 webapps/docs/changelog.xml | 10 ++
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/bin/catalina.sh b/bin/catalina.sh
index baa0bd9..5fbdb72 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -354,7 +354,7 @@ if [ "$1" = "debug" ] ; then
 echo "Using Security Manager"
   fi
   shift
-  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" 
"$CATALINA_OPTS" \
+  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS 
$CATALINA_OPTS \
 -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
 -classpath "$CLASSPATH" \
 -sourcepath "$CATALINA_HOME"/../../java \
@@ -365,7 +365,7 @@ if [ "$1" = "debug" ] ; then
 -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 org.apache.catalina.startup.Bootstrap "$@" start
 else
-  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" 
"$CATALINA_OPTS" \
+  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS 
$CATALINA_OPTS \
 -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
 -classpath "$CLASSPATH" \
 -sourcepath "$CATALINA_HOME"/../../java \
@@ -384,7 +384,7 @@ elif [ "$1" = "run" ]; then
   echo "Using Security Manager"
 fi
 shift
-eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -394,7 +394,7 @@ elif [ "$1" = "run" ]; then
   -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
   org.apache.catalina.startup.Bootstrap "$@" start
   else
-eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -452,7 +452,7 @@ elif [ "$1" = "start" ] ; then
   echo "Using Security Manager"
 fi
 shift
-eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -464,7 +464,7 @@ elif [ "$1" = "start" ] ; then
   >> "$CATALINA_OUT" 2>&1 "&"
 
   else
-eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -517,7 +517,7 @@ elif [ "$1" = "stop" ] ; then
 fi
   fi
 
-  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
 -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
 -classpath "\"$CLASSPATH\"" \
 -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -604,7 +604,7 @@ elif [ "$1" = "stop" ] ; then
 
 elif [ "$1" = "configtest" ] ; then
 
-eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 3c517ba..afa4c89 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -208,7 +208,7 @@ case "$1" in
   -outfile "&1" \
   -errfile "&2" \
   -classpath "$CLASSPATH" \
-  "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \
+  "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
   -Dcatalina.base="$CATALINA_BASE" \
   -Dcatalina.home="$CATALINA_HOME" \
@@ -225,7 +225,7 @@ case "$1" in
   -outfile "$CATALINA_OUT" \
   -errfile "&1" \
   -classpath "$CLASSPATH" \
-  "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \
+  "$LOGGING_CONFIG" $JAVA_OPT

[tomcat] branch 8.5.x updated: Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

2019-11-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new d946928  Revert the fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
d946928 is described below

commit d946928f956adffa59fcf94fd759dbab6e0e38a4
Author: Mark Thomas 
AuthorDate: Mon Nov 25 20:44:37 2019 +

Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

This triggered various regressions, particularly with daemon.sh
---
 bin/catalina.sh| 16 
 bin/daemon.sh  |  4 ++--
 bin/tool-wrapper.sh|  2 +-
 webapps/docs/changelog.xml | 10 ++
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/bin/catalina.sh b/bin/catalina.sh
index baa0bd9..5fbdb72 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -354,7 +354,7 @@ if [ "$1" = "debug" ] ; then
 echo "Using Security Manager"
   fi
   shift
-  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" 
"$CATALINA_OPTS" \
+  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS 
$CATALINA_OPTS \
 -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
 -classpath "$CLASSPATH" \
 -sourcepath "$CATALINA_HOME"/../../java \
@@ -365,7 +365,7 @@ if [ "$1" = "debug" ] ; then
 -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 org.apache.catalina.startup.Bootstrap "$@" start
 else
-  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" 
"$CATALINA_OPTS" \
+  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS 
$CATALINA_OPTS \
 -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
 -classpath "$CLASSPATH" \
 -sourcepath "$CATALINA_HOME"/../../java \
@@ -384,7 +384,7 @@ elif [ "$1" = "run" ]; then
   echo "Using Security Manager"
 fi
 shift
-eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -394,7 +394,7 @@ elif [ "$1" = "run" ]; then
   -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
   org.apache.catalina.startup.Bootstrap "$@" start
   else
-eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -452,7 +452,7 @@ elif [ "$1" = "start" ] ; then
   echo "Using Security Manager"
 fi
 shift
-eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -464,7 +464,7 @@ elif [ "$1" = "start" ] ; then
   >> "$CATALINA_OUT" 2>&1 "&"
 
   else
-eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -517,7 +517,7 @@ elif [ "$1" = "stop" ] ; then
 fi
   fi
 
-  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
 -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
 -classpath "\"$CLASSPATH\"" \
 -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -604,7 +604,7 @@ elif [ "$1" = "stop" ] ; then
 
 elif [ "$1" = "configtest" ] ; then
 
-eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 3c517ba..afa4c89 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -208,7 +208,7 @@ case "$1" in
   -outfile "&1" \
   -errfile "&2" \
   -classpath "$CLASSPATH" \
-  "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \
+  "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
   -Dcatalina.base="$CATALINA_BASE" \
   -Dcatalina.home="$CATALINA_HOME" \
@@ -225,7 +225,7 @@ case "$1" in
   -outfile "$CATALINA_OUT" \
   -errfile "&1" \
   -classpath "$CLASSPATH" \
-  "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \
+  "$LOGGING_CONFIG" $JAVA_OPTS

[tomcat] branch 7.0.x updated: Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

2019-11-25 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/7.0.x by this push:
 new ef64c6f  Revert the fix for 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815
ef64c6f is described below

commit ef64c6fc9d6a3abdb0b9ea420599783c79d43caf
Author: Mark Thomas 
AuthorDate: Mon Nov 25 20:44:37 2019 +

Revert the fix for https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

This triggered various regressions, particularly with daemon.sh
---
 bin/catalina.sh| 16 
 bin/daemon.sh  |  4 ++--
 bin/tool-wrapper.sh|  2 +-
 webapps/docs/changelog.xml | 10 ++
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/bin/catalina.sh b/bin/catalina.sh
index ca09baa..f873a8f 100755
--- a/bin/catalina.sh
+++ b/bin/catalina.sh
@@ -350,7 +350,7 @@ if [ "$1" = "debug" ] ; then
 echo "Using Security Manager"
   fi
   shift
-  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" 
"$CATALINA_OPTS" \
+  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS 
$CATALINA_OPTS \
 -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
 -classpath "$CLASSPATH" \
 -sourcepath "$CATALINA_HOME"/../../java \
@@ -361,7 +361,7 @@ if [ "$1" = "debug" ] ; then
 -Djava.io.tmpdir="$CATALINA_TMPDIR" \
 org.apache.catalina.startup.Bootstrap "$@" start
 else
-  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER "$JAVA_OPTS" 
"$CATALINA_OPTS" \
+  exec "$_RUNJDB" "$LOGGING_CONFIG" $LOGGING_MANAGER $JAVA_OPTS 
$CATALINA_OPTS \
 -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
 -classpath "$CLASSPATH" \
 -sourcepath "$CATALINA_HOME"/../../java \
@@ -380,7 +380,7 @@ elif [ "$1" = "run" ]; then
   echo "Using Security Manager"
 fi
 shift
-eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -390,7 +390,7 @@ elif [ "$1" = "run" ]; then
   -Djava.io.tmpdir="\"$CATALINA_TMPDIR\"" \
   org.apache.catalina.startup.Bootstrap "$@" start
   else
-eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval exec "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -448,7 +448,7 @@ elif [ "$1" = "start" ] ; then
   echo "Using Security Manager"
 fi
 shift
-eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Djava.security.manager \
@@ -460,7 +460,7 @@ elif [ "$1" = "start" ] ; then
   >> "$CATALINA_OUT" 2>&1 "&"
 
   else
-eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
"$JAVA_OPTS" "$CATALINA_OPTS" \
+eval $_NOHUP "\"$_RUNJAVA\"" "\"$LOGGING_CONFIG\"" $LOGGING_MANAGER 
$JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -513,7 +513,7 @@ elif [ "$1" = "stop" ] ; then
 fi
   fi
 
-  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+  eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
 -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
 -classpath "\"$CLASSPATH\"" \
 -Dcatalina.base="\"$CATALINA_BASE\"" \
@@ -600,7 +600,7 @@ elif [ "$1" = "stop" ] ; then
 
 elif [ "$1" = "configtest" ] ; then
 
-eval "\"$_RUNJAVA\"" $LOGGING_MANAGER "$JAVA_OPTS" \
+eval "\"$_RUNJAVA\"" $LOGGING_MANAGER $JAVA_OPTS \
   -D$ENDORSED_PROP="\"$JAVA_ENDORSED_DIRS\"" \
   -classpath "\"$CLASSPATH\"" \
   -Dcatalina.base="\"$CATALINA_BASE\"" \
diff --git a/bin/daemon.sh b/bin/daemon.sh
index 3c517ba..afa4c89 100755
--- a/bin/daemon.sh
+++ b/bin/daemon.sh
@@ -208,7 +208,7 @@ case "$1" in
   -outfile "&1" \
   -errfile "&2" \
   -classpath "$CLASSPATH" \
-  "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \
+  "$LOGGING_CONFIG" $JAVA_OPTS $CATALINA_OPTS \
   -D$ENDORSED_PROP="$JAVA_ENDORSED_DIRS" \
   -Dcatalina.base="$CATALINA_BASE" \
   -Dcatalina.home="$CATALINA_HOME" \
@@ -225,7 +225,7 @@ case "$1" in
   -outfile "$CATALINA_OUT" \
   -errfile "&1" \
   -classpath "$CLASSPATH" \
-  "$LOGGING_CONFIG" "$JAVA_OPTS" "$CATALINA_OPTS" \
+  "$LOGGING_CONFIG" $JAVA_OPTS

[Bug 63815] Expansion of JAVA_OPTS in catalina.sh containing '*' stops startup on linux

2019-11-25 Thread bugzilla 
https://bz.apache.org/bugzilla/show_bug.cgi?id=63815

--- Comment #11 from Mark Thomas  ---
I have reverted this for :
- master for 9.0.30 onwards
- 8.5.x for 8.5.50 onwards
- 7.0.99 onwards

due to the regressions.

There are broadly three different scenarios:
a) passing to java in catalina.sh/tool-wrapper.sh
b) passing to jsvc in daemon.sh
c) passing to jdb in catalina.sh

I haven't been able to find a one size fits all solution. There are various
options for a) - which would address the original bug report - but I'd like to
explore this some more to see what options exist for b) and c). I could live
with no solving c) but ideally b) needs a solution.

For anyone else looking at this, it is worth looking through the history of
deamon.sh for all the various edge cases that have been addressed over the
years.

-- 
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

[GitHub] [tomcat] markt-asf commented on a change in pull request #225: BZ 63681: Introduce RealmBase#authenticate(GSSName, GSSCredential) an…

2019-11-25 Thread GitBox 
markt-asf commented on a change in pull request #225: BZ 63681: Introduce 
RealmBase#authenticate(GSSName, GSSCredential) an…
URL: https://github.com/apache/tomcat/pull/225#discussion_r350420082
 
 

 ##
 File path: java/org/apache/catalina/Realm.java
 ##
 @@ -116,6 +118,17 @@ public Principal authenticate(String username, String 
digest,
 public Principal authenticate(GSSContext gssContext, boolean storeCreds);
 
 
+/**
+ * Try to authenticate using a {@link GSSName}
+ *
+ * @param gssName The {@link GSSName} of the principal to look up
+ * @param gssCredential The {@link GSSCredential} of the principal, may be
+ *  {@code null}
+ * @return the associated principal, or {@code null} if there is none
+ */
+public Principal authenticate(GSSName gssName, GSSCredential 
gssCredential);
+
 
 Review comment:
   Yes.


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

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

[tomcat] branch 8.5.x updated: Pull down APR specific lock structure

2019-11-25 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new aeec08f  Pull down APR specific lock structure
aeec08f is described below

commit aeec08f36c3e8bc045c50f6f4d537e53b99e7cc4
Author: remm 
AuthorDate: Mon Nov 25 23:40:23 2019 +0100

Pull down APR specific lock structure

They would otherwise be allocated for NIOx but are not used at all.
Port a472f6af67a7cc03fe42a55cfaa7902933117afd
---
 java/org/apache/tomcat/util/net/AprEndpoint.java   | 20 ++
 .../apache/tomcat/util/net/SocketWrapperBase.java  | 24 ++
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java 
b/java/org/apache/tomcat/util/net/AprEndpoint.java
index d325b3c..927dd01 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -33,6 +33,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import javax.net.ssl.KeyManager;
@@ -2096,10 +2097,21 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 // This field should only be used by Poller#run()
 private int pollerFlags = 0;
 
+/*
+ * Used if block/non-blocking is set at the socket level. The client is
+ * responsible for the thread-safe use of this field via the locks 
provided.
+ */
+private volatile boolean blockingStatus = true;
+private final Lock blockingStatusReadLock;
+private final WriteLock blockingStatusWriteLock;
 
 public AprSocketWrapper(Long socket, AprEndpoint endpoint) {
 super(socket, endpoint);
 
+ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+this.blockingStatusReadLock = lock.readLock();
+this.blockingStatusWriteLock = lock.writeLock();
+
 // TODO Make the socketWriteBuffer size configurable and align the
 //  SSL and app buffer size settings with NIO & NIO2.
 if (endpoint.isSSLEnabled()) {
@@ -2112,6 +2124,14 @@ public class AprEndpoint extends AbstractEndpoint 
implements SNICallBack {
 socketBufferHandler = new SocketBufferHandler(6 * 1500, 6 * 1500, 
true);
 }
 
+public boolean getBlockingStatus() { return blockingStatus; }
+public void setBlockingStatus(boolean blockingStatus) {
+this.blockingStatus = blockingStatus;
+}
+public Lock getBlockingStatusReadLock() { return 
blockingStatusReadLock; }
+public WriteLock getBlockingStatusWriteLock() {
+return blockingStatusWriteLock;
+}
 
 @Override
 public int read(boolean block, byte[] b, int off, int len) throws 
IOException {
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java 
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 1470a6c..dd5e741 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -28,9 +28,6 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -65,14 +62,8 @@ public abstract class SocketWrapperBase {
 protected String remoteAddr = null;
 protected String remoteHost = null;
 protected int remotePort = -1;
-/*
- * Used if block/non-blocking is set at the socket level. The client is
- * responsible for the thread-safe use of this field via the locks 
provided.
- */
-private volatile boolean blockingStatus = true;
-private final Lock blockingStatusReadLock;
-private final WriteLock blockingStatusWriteLock;
-/*
+
+/**
  * Used to record the first IOException that occurs during non-blocking
  * read/writes that can't be usefully propagated up the stack since there 
is
  * no user code or appropriate container code in the stack to handle it.
@@ -112,9 +103,6 @@ public abstract class SocketWrapperBase {
 public SocketWrapperBase(E socket, AbstractEndpoint endpoint) {
 this.socket = socket;
 this.endpoint = endpoint;
-ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-this.blockingStatusReadLock = lock.readLock();
-