[ANN] Apache Tomcat Connectors 1.2.39 released

2014-03-11 Thread Mladen Turk

The Apache Tomcat Project is proud to announce the release of version 1.2.39
of Apache Tomcat Connectors.
This version fixes few bugs found in previous releases and adds some new
features like IPV6 support.

Full details of these changes and new features,
are available in the Apache Tomcat Connectors changelog:
http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html

Downloads:
http://tomcat.apache.org/download-connectors.cgi

Thank you,
--
The Apache Tomcat Team

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



[Bug 56239] NullPointerException when finishing response under the Linux traffic control

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56239

--- Comment #5 from Lsk  ---
Well, I have fixed the second problme that you say (switch tomcat version to
last_release_stable) and everything is okay ...


i have been look around the all tomcat's changelog from 7.0.39 to 7.0.52 at
this page: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html  
but found nothing about with "NIO Connector maybe thrown a NullPointerException
in some case" 

what is the difference between this two version 7.0.39-7.0.52 ?

-- 
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: r1576582 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/manager/ java/org/apache/catalina/session/ webapps/docs/

2014-03-11 Thread kfujino
Author: kfujino
Date: Wed Mar 12 05:04:06 2014
New Revision: 1576582

URL: http://svn.apache.org/r1576582
Log:
Add methods of get the idle time from last client access time to 
org.apache.catalina.Session. 

Modified:
tomcat/trunk/java/org/apache/catalina/Session.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/Session.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Session.java?rev=1576582&r1=1576581&r2=1576582&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Session.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Session.java Wed Mar 12 05:04:06 2014
@@ -166,6 +166,17 @@ public interface Session {
 public long getLastAccessedTimeInternal();
 
 /**
+ * Return the idle time (in milliseconds) from last client access time.
+ */
+public long getIdleTime();
+
+/**
+ * Return the idle time from last client access time without invalidation 
check
+ * @see #getIdleTime()
+ */
+public long getIdleTimeInternal();
+
+/**
  * Return the Manager within which this Session is valid.
  */
 public Manager getManager();

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1576582&r1=1576581&r2=1576582&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Wed Mar 
12 05:04:06 2014
@@ -386,13 +386,7 @@ public class DeltaSession extends Standa
 return true;
 }
 if (maxInactiveInterval > 0) {
-long timeNow = System.currentTimeMillis();
-int timeIdle;
-if (LAST_ACCESS_AT_START) {
-timeIdle = (int) ((timeNow - lastAccessedTime) / 1000L);
-} else {
-timeIdle = (int) ((timeNow - thisAccessedTime) / 1000L);
-}
+int timeIdle = (int) (getIdleTimeInternal() / 1000L);
 if (isPrimarySession()) {
 if (timeIdle >= maxInactiveInterval) {
 expire(true);

Modified: tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java?rev=1576582&r1=1576581&r2=1576582&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/DummyProxySession.java Wed 
Mar 12 05:04:06 2014
@@ -89,6 +89,16 @@ public class DummyProxySession implement
 }
 
 @Override
+public long getIdleTime() {
+return 0;
+}
+
+@Override
+public long getIdleTimeInternal() {
+return 0;
+}
+
+@Override
 public Manager getManager() {
 return null;
 }

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1576582&r1=1576581&r2=1576582&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Mar 
12 05:04:06 2014
@@ -45,7 +45,6 @@ import org.apache.catalina.Container;
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
-import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Server;
@@ -157,19 +156,6 @@ public class ManagerServlet extends Http
 
 private static final long serialVersionUID = 1L;
 
-protected static final boolean LAST_ACCESS_AT_START;
-
-static {
-String lastAccessAtStart = System.getProperty(
-
"org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START");
-if (lastAccessAtStart == null) {
-LAST_ACCESS_AT_START = Globals.STRICT_SERVLET_COMPLIANCE;
-} else {
-LAST_ACCESS_AT_START =
-Boolean.valueOf(lastAccessAtStart).booleanValue();
-}
-}
-
 // - Instance 

svn commit: r1576577 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2014-03-11 Thread kfujino
Author: kfujino
Date: Wed Mar 12 04:17:38 2014
New Revision: 1576577

URL: http://svn.apache.org/r1576577
Log:
Add support for LAST_ACCESS_AT_START system property to Manager web application.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1576577&r1=1576576&r2=1576577&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
Wed Mar 12 04:17:38 2014
@@ -153,6 +153,18 @@ public class ManagerServlet extends Http
 
 private static final long serialVersionUID = 1L;
 
+protected static final boolean LAST_ACCESS_AT_START;
+
+static {
+String lastAccessAtStart = System.getProperty(
+
"org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START");
+if (lastAccessAtStart == null) {
+LAST_ACCESS_AT_START = Globals.STRICT_SERVLET_COMPLIANCE;
+} else {
+LAST_ACCESS_AT_START =
+Boolean.valueOf(lastAccessAtStart).booleanValue();
+}
+}
 
 // - Instance Variables
 
@@ -1144,7 +1156,12 @@ public class ManagerServlet extends Http
 int expired = 0;
 long now = System.currentTimeMillis();
 for (int i = 0; i < sessions.length; i++) {
-int time = 
(int)((now-sessions[i].getThisAccessedTimeInternal())/1000);
+int time;
+if (LAST_ACCESS_AT_START) {
+time = (int) ((now - 
sessions[i].getLastAccessedTimeInternal()) / 1000L);
+} else {
+time = (int) ((now - 
sessions[i].getThisAccessedTimeInternal()) / 1000L);
+}
 if (idle >= 0 && time >= idle*60) {
 sessions[i].expire();
 expired++;

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1576577&r1=1576576&r2=1576577&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Mar 12 04:17:38 2014
@@ -145,6 +145,10 @@
 "Expire sessions" command in the manager web application on a
 context where the session timeout is disabled. (kfujino)
   
+  
+ Add support for LAST_ACCESS_AT_START system property to
+ Manager web application. (kfujino)
+  
 
   
   



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



svn commit: r1576576 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2014-03-11 Thread kfujino
Author: kfujino
Date: Wed Mar 12 04:16:11 2014
New Revision: 1576576

URL: http://svn.apache.org/r1576576
Log:
Add support for LAST_ACCESS_AT_START system property to Manager web application.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1576576&r1=1576575&r2=1576576&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Mar 
12 04:16:11 2014
@@ -45,6 +45,7 @@ import org.apache.catalina.Container;
 import org.apache.catalina.ContainerServlet;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
+import org.apache.catalina.Globals;
 import org.apache.catalina.Host;
 import org.apache.catalina.Manager;
 import org.apache.catalina.Server;
@@ -156,6 +157,18 @@ public class ManagerServlet extends Http
 
 private static final long serialVersionUID = 1L;
 
+protected static final boolean LAST_ACCESS_AT_START;
+
+static {
+String lastAccessAtStart = System.getProperty(
+
"org.apache.catalina.session.StandardSession.LAST_ACCESS_AT_START");
+if (lastAccessAtStart == null) {
+LAST_ACCESS_AT_START = Globals.STRICT_SERVLET_COMPLIANCE;
+} else {
+LAST_ACCESS_AT_START =
+Boolean.valueOf(lastAccessAtStart).booleanValue();
+}
+}
 
 // - Instance Variables
 
@@ -1170,7 +1183,12 @@ public class ManagerServlet extends Http
 int expired = 0;
 long now = System.currentTimeMillis();
 for (int i = 0; i < sessions.length; i++) {
-int time = 
(int)((now-sessions[i].getThisAccessedTimeInternal())/1000);
+int time;
+if (LAST_ACCESS_AT_START) {
+time = (int) ((now - 
sessions[i].getLastAccessedTimeInternal()) / 1000L);
+} else {
+time = (int) ((now - 
sessions[i].getThisAccessedTimeInternal()) / 1000L);
+}
 if (idle >= 0 && time >= idle*60) {
 sessions[i].expire();
 expired++;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576576&r1=1576575&r2=1576576&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 12 04:16:11 2014
@@ -179,6 +179,10 @@
 "Expire sessions" command in the manager web application on a
 context where the session timeout is disabled. (kfujino)
   
+  
+ Add support for LAST_ACCESS_AT_START system property to
+ Manager web application. (kfujino)
+  
 
   
   



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



[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed

2014-03-11 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-test has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 5 runs.
The current state of this project is 'Failed', with reason 'Build Timed Out'.
For reference only, the following projects are affected by this:
- tomcat-trunk-test :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
commons-daemon.native.src.tgz.
 -DEBUG- Dependency on commons-daemon exists, no need to add for property 
tomcat-native.tar.gz.
 -DEBUG- Dependency on tomcat-trunk exists, no need to add for property 
tomcat-dbcp.home.
 -INFO- Failed with reason build timed out
 -INFO- Project Reports in: 
/srv/gump/public/workspace/tomcat-trunk/output/build/logs



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html
Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build)
Work ended in a state of : Failed
Elapsed: 60 mins
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.12-SNAPSHOT.jar 
-Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-2.2-SNAPSHOT.jar
 
-Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140312-native-src.tar.gz
 -Dexamples.sources.skip=true 
-Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps 
-Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar
 
-Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-20140312.jar
 
-Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-20140312-native-src.tar.gz
 -Dtest.accesslog=true 
-Dcommons-pool.home=/srv/gump/public/workspace/apache-commons/pool 
-Dcommons-dbcp
 .home=/srv/gump/public/workspace/apache-commons/dbcp 
-Deasymock.jar=/srv/gump/public/workspace/easymock/easymock/target/easymock-3.3-SNAPSHOT.jar
 
-Dhamcrest.jar=/srv/gump/public/workspace/hamcrest/hamcrest-java/build/hamcrest-core-20140312.jar
 -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servle
 
t-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat
 
-trunk/output/build/lib/tomcat-spdy.jar:/srv/gump/public/workspace/tomcat-trunk/

svn commit: r1576550 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java

2014-03-11 Thread remm
Author: remm
Date: Wed Mar 12 00:06:38 2014
New Revision: 1576550

URL: http://svn.apache.org/r1576550
Log:
Revert timeout change (no effect).

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1576550&r1=1576549&r2=1576550&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java Wed 
Mar 12 00:06:38 2014
@@ -43,7 +43,7 @@ public class TesterFirehoseServer {
 public static final String MESSAGE;
 public static final int MESSAGE_SIZE = 1024;
 public static final int WAIT_TIME_MILLIS = 6;
-public static final int SEND_TIME_OUT_MILLIS = 1;
+public static final int SEND_TIME_OUT_MILLIS = 5000;
 
 static {
 StringBuilder sb = new StringBuilder(MESSAGE_SIZE);



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



[Bug 53119] java.nio.BufferOverflowException in AjpAprProcessor.output() when AJP client disconnects

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53119

--- Comment #8 from Claes Mogren  ---
Is it absolutely sure that this bug is fixed? I tried to use ajp-nio with the
latest 7.0.52 version and get the same problem right on the first page:

Mar 12, 2014 12:18:09 AM org.apache.coyote.AbstractProtocol start
INFO: Starting ProtocolHandler ["http-bio-8091"]
Mar 12, 2014 12:18:09 AM org.apache.coyote.AbstractProtocol start
INFO: Starting ProtocolHandler ["ajp-nio-8016"]
Mar 12, 2014 12:18:09 AM org.apache.catalina.startup.Catalina start
INFO: Server startup in 32142 ms
Mar 12, 2014 12:18:46 AM org.apache.coyote.ajp.AjpNioProcessor process
SEVERE: Error processing request
java.nio.BufferOverflowException
at java.nio.HeapByteBuffer.put(HeapByteBuffer.java:183)
at org.apache.coyote.ajp.AjpNioProcessor.output(AjpNioProcessor.java:296)
at
org.apache.coyote.ajp.AbstractAjpProcessor$SocketOutputBuffer.doWrite(AbstractAjpProcessor.java:1195)
at org.apache.coyote.Response.doWrite(Response.java:520)
at
org.apache.catalina.connector.OutputBuffer.realWriteBytes(OutputBuffer.java:408)
at org.apache.tomcat.util.buf.ByteChunk.flushBuffer(ByteChunk.java:480)
at
org.apache.catalina.connector.OutputBuffer.realWriteChars(OutputBuffer.java:491)
at org.apache.tomcat.util.buf.CharChunk.flushBuffer(CharChunk.java:464)
at org.apache.catalina.connector.OutputBuffer.close(OutputBuffer.java:293)
at org.apache.catalina.connector.Response.finishResponse(Response.java:510)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:435)
at org.apache.coyote.ajp.AjpNioProcessor.process(AjpNioProcessor.java:177)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:607)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1721)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1679)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)

-- 
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: r1576548 - in /tomcat/trunk/java/org/apache: coyote/http11/upgrade/Nio2ServletInputStream.java coyote/http11/upgrade/Nio2ServletOutputStream.java tomcat/util/net/Nio2Channel.java

2014-03-11 Thread remm
Author: remm
Date: Wed Mar 12 00:06:10 2014
New Revision: 1576548

URL: http://svn.apache.org/r1576548
Log:
- Harmonize with the NIO1 connector for upgrade close.
- Actually understand where the (cosmetic) async close traces were coming from.

Modified:

tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java

tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Channel.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java?rev=1576548&r1=1576547&r2=1576548&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java 
Wed Mar 12 00:06:10 2014
@@ -71,6 +71,10 @@ public class Nio2ServletInputStream exte
 public void failed(Throwable exc, SocketWrapper 
attachment) {
 attachment.setError(true);
 readPending = false;
+if (exc instanceof AsynchronousCloseException) {
+// If already closed, don't call onError and close again 
+return;
+}
 onError(exc);
 try {
 close();
@@ -189,11 +193,7 @@ public class Nio2ServletInputStream exte
 
 @Override
 protected void doClose() throws IOException {
-try {
-channel.close();
-} catch (AsynchronousCloseException e) {
-// Ignore
-}
+channel.close();
 }
 
 private int fillReadBuffer(boolean block) throws IOException {

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java?rev=1576548&r1=1576547&r2=1576548&view=diff
==
--- 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java 
(original)
+++ 
tomcat/trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java 
Wed Mar 12 00:06:10 2014
@@ -63,6 +63,10 @@ public class Nio2ServletOutputStream ext
 public void failed(Throwable exc, SocketWrapper 
attachment) {
 attachment.setError(true);
 writePending = false;
+if (exc instanceof AsynchronousCloseException) {
+// If already closed, don't call onError and close again 
+return;
+}
 onError(exc);
 try {
 close();
@@ -157,10 +161,6 @@ public class Nio2ServletOutputStream ext
 
 @Override
 protected void doClose() throws IOException {
-try {
-channel.close();
-} catch (AsynchronousCloseException e) {
-// Ignore
-}
+channel.close(true);
 }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Channel.java?rev=1576548&r1=1576547&r2=1576548&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Channel.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Channel.java Wed Mar 12 
00:06:10 2014
@@ -84,12 +84,15 @@ public class Nio2Channel implements Asyn
  */
 @Override
 public void close() throws IOException {
-getIOChannel().close();
+sc.close();
 }
 
 public void close(boolean force) throws IOException {
-if (isOpen() || force ) close();
+if (isOpen() || force) {
+close();
+}
 }
+
 /**
  * Tells whether or not this channel is open.
  *



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



[GUMP@vmgump]: Project tomcat-trunk-validate (in module tomcat-trunk) failed

2014-03-11 Thread Bill Barker
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-trunk-validate has an issue affecting its community integration.
This issue affects 1 projects,
 and has been outstanding for 4 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-trunk-validate :  Tomcat 8.x, a web server implementing the Java 
Servlet 3.1,
...


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -DEBUG- Dependency on checkstyle exists, no need to add for property 
checkstyle.jar.
 -INFO- Failed with reason build failed



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/gump_work/build_tomcat-trunk_tomcat-trunk-validate.html
Work Name: build_tomcat-trunk_tomcat-trunk-validate (Type: Build)
Work ended in a state of : Failed
Elapsed: 27 secs
Command Line: /usr/lib/jvm/java-7-oracle/bin/java -Djava.awt.headless=true 
-Dbuild.sysclasspath=only org.apache.tools.ant.Main 
-Dgump.merge=/srv/gump/public/gump/work/merge.xml 
-Dcheckstyle.jar=/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar
 -Dexecute.validate=true validate 
[Working Directory: /srv/gump/public/workspace/tomcat-trunk]
CLASSPATH: 
/usr/lib/jvm/java-7-oracle/lib/tools.jar:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/packages/antlr/antlr-3.1.3.jar:/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/beanutils/dist/commons-beanutils-20140312.jar:/srv/gump/public/workspace/apache-commons/cli/target/commons-cli-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/commons-collections-3.x/target/commons-collections-3.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/exec/tar
 
get/commons-exec-1.3-SNAPSHOT.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-20140312.jar:/srv/gump/public/workspace/apache-commons/logging/target/commons-logging-api-20140312.jar:/srv/gump/public/workspace/apache-commons/validator/dist/commons-validator-20140312.jar:/srv/gump/public/workspace/google-guava/guava/target/guava-17.0-SNAPSHOT.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar
-
Buildfile: /srv/gump/public/workspace/tomcat-trunk/build.xml

build-prepare:
   [delete] Deleting directory 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/build/temp

compile-prepare:

download-validate:

proxyflags:

setproxy:

testexist:
 [echo] Testing  for 
/srv/gump/public/workspace/checkstyle/target/checkstyle-5.7-SNAPSHOT.jar

downloadzip:

validate:
[mkdir] Created dir: 
/srv/gump/public/workspace/tomcat-trunk/output/res/checkstyle
[checkstyle] Running Checkstyle 5.7-SNAPSHOT on 2769 files
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletInputStream.java:75:
 Line matches the illegal pattern '\s+$'.
[checkstyle] 
/srv/gump/public/workspace/tomcat-trunk/java/org/apache/coyote/http11/upgrade/Nio2ServletOutputStream.java:67:
 Line matches the illegal pattern '\s+$'.

BUILD FAILED
/srv/gump/public/workspace/tomcat-trunk/build.xml:539: Got 2 errors and 0 
warnings.

Total time: 27 seconds
-

To subscribe to this information via syndicated feeds:
- RSS: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/rss.xml
- Atom: 
http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-validate/atom.xml

== Gump Tracking Only ===
Produced by Apache Gump(TM) version 2.3.
Gump Run 2014031205, vmgump.apache.org:vmgump:2014031205
Gump E-mail Identifier (unique within run) #2.

--
Apache Gump
http://gump.apache.org/ [Instance: vmgump]

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



Re: svn commit: r1576079 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

2014-03-11 Thread Konstantin Kolinko
2014-03-11 23:59 GMT+04:00 Christopher Schultz :
> Konstantin,
>
> On 3/10/14, 4:51 PM, kkoli...@apache.org wrote:
>> Author: kkolinko
>> Date: Mon Mar 10 20:51:51 2014
>> New Revision: 1576079
>>
>> URL: http://svn.apache.org/r1576079
>> Log:
>> Revert r1576000
>> It obviously was meant to be applied for trunk, not for Tomcat 6.
>
> Thanks for fixing this for me. I'm sorry for not being careful while
> making that edit.
>

OK, it happens.

Note that I've already fixed this in trunk.
https://issues.apache.org/bugzilla/show_bug.cgi?id=56244

Best regards,
Konstantin Kolinko

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



Re: svn commit: r1576079 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

2014-03-11 Thread Christopher Schultz
Konstantin,

On 3/10/14, 4:51 PM, kkoli...@apache.org wrote:
> Author: kkolinko
> Date: Mon Mar 10 20:51:51 2014
> New Revision: 1576079
> 
> URL: http://svn.apache.org/r1576079
> Log:
> Revert r1576000
> It obviously was meant to be applied for trunk, not for Tomcat 6.

Thanks for fixing this for me. I'm sorry for not being careful while
making that edit.

Thanks,
-chris



signature.asc
Description: OpenPGP digital signature


Re: svn commit: r1576000 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml

2014-03-11 Thread Christopher Schultz
Mark,

On 3/10/14, 12:53 PM, Mark Thomas wrote:
> On 10/03/2014 16:48, schu...@apache.org wrote:
>> Author: schultz
>> Date: Mon Mar 10 16:48:57 2014
>> New Revision: 1576000
>>
>> URL: http://svn.apache.org/r1576000
>> Log:
>> Removed "jarPath" attribute, which has been removed from WebappClassLoader.
>>
>> Modified:
>> 
>> tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
> 
> Two issues with that commit.
> 
> 1. 6.0.x is RTC and there was no R before the C.
> 
> 2. jarPath is still present in 6.0.x. Did you mean to update trunk?
> 
> I think this needs to be reverted.

+1

I have all 3 lines available in Eclipse and there are about 500
mbeans-descriptors.xml files. I was very sloppy and changed the wrong
one. I'll fix it right away.

-chris



signature.asc
Description: OpenPGP digital signature


[Bug 56242] Deploying a Velocity-based web application can thwart Attach API connections for monitoring

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56242

--- Comment #4 from Christopher Schultz  ---
I'll give -x:verify:none a try (on the client?) but this also happens with both
jconsole and YourKit. Might this be an underlying JVM bug? I didn't try with
other versions (e.g. OpenJDK, IBM, or Sun/Oracle Java 6) yet.

-- 
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: r1576385 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SecureNio2Channel.java test/org/apache/tomcat/util/net/TestSsl.java

2014-03-11 Thread remm
Author: remm
Date: Tue Mar 11 15:41:02 2014
New Revision: 1576385

URL: http://svn.apache.org/r1576385
Log:
- Fix SSL output with blocking writes when a handshake occurs during the flow.
- Fix relevant test as pointed out by Konstantin.

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1576385&r1=1576384&r2=1576385&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Mar 
11 15:41:02 2014
@@ -581,22 +581,6 @@ public class SecureNio2Channel extends N
 t = new IOException("Channel is in closing state.");
 return;
 }
-//The data buffer should be empty, we can reuse the entire buffer.
-netOutBuffer.clear();
-try {
-SSLEngineResult result = 
sslEngine.wrap(bufHandler.getWriteBuffer(), netOutBuffer);
-written = result.bytesConsumed();
-netOutBuffer.flip();
-if (result.getStatus() == Status.OK) {
-if (result.getHandshakeStatus() == 
HandshakeStatus.NEED_TASK)
-tasks();
-} else {
-t = new IOException("Unable to wrap data, invalid engine 
state: " +result.getStatus());
-}
-integer = sc.write(netOutBuffer);
-} catch (SSLException e) {
-t = e;
-}
 }
 @Override
 public boolean cancel(boolean mayInterruptIfRunning) {
@@ -612,21 +596,49 @@ public class SecureNio2Channel extends N
 }
 @Override
 public Integer get() throws InterruptedException, ExecutionException {
+wrap();
 if (t != null) {
 throw new ExecutionException(t);
 }
 integer.get();
-return Integer.valueOf(written);
+if (written == 0) {
+return get();
+} else {
+return Integer.valueOf(written);
+}
 }
 @Override
 public Integer get(long timeout, TimeUnit unit)
 throws InterruptedException, ExecutionException,
 TimeoutException {
+wrap();
 if (t != null) {
 throw new ExecutionException(t);
 }
 integer.get(timeout, unit);
-return Integer.valueOf(written);
+if (written == 0) {
+return get(timeout, unit);
+} else {
+return Integer.valueOf(written);
+}
+}
+protected void wrap() {
+//The data buffer should be empty, we can reuse the entire buffer.
+netOutBuffer.clear();
+try {
+SSLEngineResult result = 
sslEngine.wrap(bufHandler.getWriteBuffer(), netOutBuffer);
+written = result.bytesConsumed();
+netOutBuffer.flip();
+if (result.getStatus() == Status.OK) {
+if (result.getHandshakeStatus() == 
HandshakeStatus.NEED_TASK)
+tasks();
+} else {
+t = new IOException("Unable to wrap data, invalid engine 
state: " +result.getStatus());
+}
+integer = sc.write(netOutBuffer);
+} catch (SSLException e) {
+t = e;
+}
 }
 }
 

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=1576385&r1=1576384&r2=1576385&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Tue Mar 11 
15:41:02 2014
@@ -33,6 +33,7 @@ import javax.net.ssl.SSLSocketFactory;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.catalina.Context;
@@ -90,7 +91,6 @@ public class TestSsl extends TomcatBaseT
 assertTrue(res.toString().indexOf("Hello World!") > 0);
 }
 
-
 boolean handshakeDone = false;
 
 @Test
@@ -204,6 +204,7 @@ public class TestSsl extends TomcatBaseT
 Reader r = new InputStreamReader(is);
 BufferedReader br = new BufferedReader(r);
 String line = br.readLine();
+Assert.assertEquals("HTTP/1.1 200 OK", line);
 while (line != null) {
 // F

Re: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Rémy Maucherat
2014-03-11 15:21 GMT+01:00 Konstantin Kolinko :

> Looking at
> org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:206)
> more closely, it is a broken test.
>

+1 on the test being broken as it is now, for me it "works" because I don't
get an IOE, but it is null instead.
Normally the test returns a meaningful answer (with NIO, it does) so
there's something broken.

Rémy


svn commit: r1576363 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java

2014-03-11 Thread remm
Author: remm
Date: Tue Mar 11 14:30:46 2014
New Revision: 1576363

URL: http://svn.apache.org/r1576363
Log:
Increase the write timeout (5s -> 10s) to see how the test reacts (or if it's a 
deadlock somewhere), I see some significant spikes in my own testing if I put 
some load on my computer.

Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java?rev=1576363&r1=1576362&r2=1576363&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterFirehoseServer.java Tue 
Mar 11 14:30:46 2014
@@ -43,7 +43,7 @@ public class TesterFirehoseServer {
 public static final String MESSAGE;
 public static final int MESSAGE_SIZE = 1024;
 public static final int WAIT_TIME_MILLIS = 6;
-public static final int SEND_TIME_OUT_MILLIS = 5000;
+public static final int SEND_TIME_OUT_MILLIS = 1;
 
 static {
 StringBuilder sb = new StringBuilder(MESSAGE_SIZE);



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



Re: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Konstantin Kolinko
2014-03-11 17:30 GMT+04:00 Konstantin Kolinko :
> 2014-03-11 17:09 GMT+04:00 Rémy Maucherat :
>> 2014-03-11 13:14 GMT+01:00 Konstantin Kolinko :
>>
>>> The only test that fails is org.apache.tomcat.util.net.TestSsl.
>>> Its failure repeats consistently (all 6 of 6 runs), with NIO2.
>>> BIO,NIO,APR connectors do not fail.
>>>
>>> [[[
>>> Testsuite: org.apache.tomcat.util.net.TestSsl
>>> Tests run: 4, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 6,697 sec
>>> -
>>> (...)
>>> -
>>> Testcase: testSimpleSsl took 2,721 sec
>>> Testcase: testKeyPass took 0,499 sec
>>> Testcase: testRenegotiateWorks took 3,418 sec
>>> Caused an ERROR
>>> Connection reset
>>> java.net.SocketException: Connection reset
>>> at java.net.SocketInputStream.read(SocketInputStream.java:196)
>>> at java.net.SocketInputStream.read(SocketInputStream.java:122)
>>> at sun.security.ssl.InputRecord.readFully(InputRecord.java:442)
>>> at sun.security.ssl.InputRecord.read(InputRecord.java:480)
>>> at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:927)
>>> at
>>> sun.security.ssl.SSLSocketImpl.readDataRecord(SSLSocketImpl.java:884)
>>> at sun.security.ssl.AppInputStream.read(AppInputStream.java:102)
>>> at sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283)
>>> at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325)
>>> at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177)
>>> at java.io.InputStreamReader.read(InputStreamReader.java:184)
>>> at java.io.BufferedReader.fill(BufferedReader.java:154)
>>> at java.io.BufferedReader.readLine(BufferedReader.java:317)
>>> at java.io.BufferedReader.readLine(BufferedReader.java:382)
>>> at
>>> org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:206)
>>>
>>> That test never failed for me actually. It is a bit suspect that I've had
>> almost no SSL problems overall with the new code, although reusing the NIO
>> secure channel structure probably helped.
>> Can you post the server exception (if any) ?
>>
>
> Which one? Do you mean some code change for that?
>
> In the logs there are no exceptions. The only one is in JUnit output,
> cited above.
>

Looking at
org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:206)
more closely, it is a broken test.

The current code is:
[[[
String line = br.readLine();
while (line != null) {
// For debugging System.out.println(line);
// Linux clients see a Connection Reset in some circumstances and a
// clean close in others.
try {
line = br.readLine();
} catch (IOException ioe) {
line = null;
}
}
]]]

The issue is that it calls br.readLine() twice,  but the first call
(before the loop starts) is not wrapped by try/catch.


Best regards,
Konstantin Kolinko

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



[Bug 56246] New: NPE in MemoryRealm when authenticating unknown user

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56246

Bug ID: 56246
   Summary: NPE in MemoryRealm when authenticating unknown user
   Product: Tomcat 7
   Version: 7.0.52
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: m...@sven-lilienthal.de

When using the embedded tomcat with a MemoryRealm for basic authentication, a
request containing an unknown username leads to a NullPointerException.

java.lang.NullPointerException
org.apache.catalina.realm.MemoryRealm.authenticate(MemoryRealm.java:143)   
org.apache.catalina.authenticator.BasicAuthenticator.authenticate(BasicAuthenticator.java:164)


MemoryRealm.authenticate get the principal via principals.get(username).
If the user is not known, he result is null.

-- 
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: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Rémy Maucherat
2014-03-11 14:30 GMT+01:00 Konstantin Kolinko :

> >> That test never failed for me actually. It is a bit suspect that I've
> had
> > almost no SSL problems overall with the new code, although reusing the
> NIO
> > secure channel structure probably helped.
> > Can you post the server exception (if any) ?
> >
>
> Which one? Do you mean some code change for that?
>
> In the logs there are no exceptions. The only one is in JUnit output,
> cited above.
>

Ok. I meant TestSsl never failed for me. So it looks like there are some
timing issues involved. All those tests are a bit "egdy" sometimes, so it's
probably not surprising. Should I disable again the tesuite for NIO2 ?

Rémy


Re: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Konstantin Kolinko
2014-03-11 17:09 GMT+04:00 Rémy Maucherat :
> 2014-03-11 13:14 GMT+01:00 Konstantin Kolinko :
>
>> The only test that fails is org.apache.tomcat.util.net.TestSsl.
>> Its failure repeats consistently (all 6 of 6 runs), with NIO2.
>> BIO,NIO,APR connectors do not fail.
>>
>> [[[
>> Testsuite: org.apache.tomcat.util.net.TestSsl
>> Tests run: 4, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 6,697 sec
>> -
>> (...)
>> -
>> Testcase: testSimpleSsl took 2,721 sec
>> Testcase: testKeyPass took 0,499 sec
>> Testcase: testRenegotiateWorks took 3,418 sec
>> Caused an ERROR
>> Connection reset
>> java.net.SocketException: Connection reset
>> at java.net.SocketInputStream.read(SocketInputStream.java:196)
>> at java.net.SocketInputStream.read(SocketInputStream.java:122)
>> at sun.security.ssl.InputRecord.readFully(InputRecord.java:442)
>> at sun.security.ssl.InputRecord.read(InputRecord.java:480)
>> at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:927)
>> at
>> sun.security.ssl.SSLSocketImpl.readDataRecord(SSLSocketImpl.java:884)
>> at sun.security.ssl.AppInputStream.read(AppInputStream.java:102)
>> at sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283)
>> at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325)
>> at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177)
>> at java.io.InputStreamReader.read(InputStreamReader.java:184)
>> at java.io.BufferedReader.fill(BufferedReader.java:154)
>> at java.io.BufferedReader.readLine(BufferedReader.java:317)
>> at java.io.BufferedReader.readLine(BufferedReader.java:382)
>> at
>> org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:206)
>>
>> That test never failed for me actually. It is a bit suspect that I've had
> almost no SSL problems overall with the new code, although reusing the NIO
> secure channel structure probably helped.
> Can you post the server exception (if any) ?
>

Which one? Do you mean some code change for that?

In the logs there are no exceptions. The only one is in JUnit output,
cited above.

Best regards,
Konstantin Kolinko

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



Re: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Rémy Maucherat
2014-03-11 13:14 GMT+01:00 Konstantin Kolinko :

> The only test that fails is org.apache.tomcat.util.net.TestSsl.
> Its failure repeats consistently (all 6 of 6 runs), with NIO2.
> BIO,NIO,APR connectors do not fail.
>
> [[[
> Testsuite: org.apache.tomcat.util.net.TestSsl
> Tests run: 4, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 6,697 sec
> -
> (...)
> -
> Testcase: testSimpleSsl took 2,721 sec
> Testcase: testKeyPass took 0,499 sec
> Testcase: testRenegotiateWorks took 3,418 sec
> Caused an ERROR
> Connection reset
> java.net.SocketException: Connection reset
> at java.net.SocketInputStream.read(SocketInputStream.java:196)
> at java.net.SocketInputStream.read(SocketInputStream.java:122)
> at sun.security.ssl.InputRecord.readFully(InputRecord.java:442)
> at sun.security.ssl.InputRecord.read(InputRecord.java:480)
> at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:927)
> at
> sun.security.ssl.SSLSocketImpl.readDataRecord(SSLSocketImpl.java:884)
> at sun.security.ssl.AppInputStream.read(AppInputStream.java:102)
> at sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283)
> at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325)
> at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177)
> at java.io.InputStreamReader.read(InputStreamReader.java:184)
> at java.io.BufferedReader.fill(BufferedReader.java:154)
> at java.io.BufferedReader.readLine(BufferedReader.java:317)
> at java.io.BufferedReader.readLine(BufferedReader.java:382)
> at
> org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:206)
>
> That test never failed for me actually. It is a bit suspect that I've had
almost no SSL problems overall with the new code, although reusing the NIO
secure channel structure probably helped.
Can you post the server exception (if any) ?

Rémy


[Bug 56245] Tomcat Set up as a SERVICE does not re-START recovery automatically. And primary to that, does crash. have a piderr file to attach.

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56245

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
The crash is in native code in EndJni.dll which is not provided by the ASF.
You'll need to get support from the organisation the wrote that library.

-- 
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: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Konstantin Kolinko
2014-03-11 15:05 GMT+04:00 Rémy Maucherat :
> 2014-03-10 22:16 GMT+01:00 :
>
>> 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/5571
>>
>> Buildbot URL: http://ci.apache.org/
>>
>> Buildslave for this Build: bb-vm_ubuntu
>>
>> Build Reason: scheduler
>> Build Source Stamp: [branch tomcat/trunk] 1576014
>> Blamelist: remm
>>
>> BUILD FAILED: failed compile_1
>>
>
> There's one failure with NIO2 and TestWebSocketFrameClient. It's working
> for me, and seems to be timeout related. Overall, I'm skeptical about
> timeout handling in upgrade mode, since it's pretending not to use IO
> timeouts, but NIO still has a write timeout (sometimes, depending on the
> code that was run before the upgrade).
>
> This particular test may be taking just a bit too long (the timeout is 5s).
> It completes just below 5s when I run it, but takes over 5s on the test
> server. Weird ...
>

Testing trunk @1576281, Win7 JDK 7u51 32-bit

The TestWebSocketFrameClient passes for me.
No failures in 3 re-runs x 4 connectors.

The only test that fails is org.apache.tomcat.util.net.TestSsl.
Its failure repeats consistently (all 6 of 6 runs), with NIO2.
BIO,NIO,APR connectors do not fail.

[[[
Testsuite: org.apache.tomcat.util.net.TestSsl
Tests run: 4, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 6,697 sec
-
(...)
-
Testcase: testSimpleSsl took 2,721 sec
Testcase: testKeyPass took 0,499 sec
Testcase: testRenegotiateWorks took 3,418 sec
Caused an ERROR
Connection reset
java.net.SocketException: Connection reset
at java.net.SocketInputStream.read(SocketInputStream.java:196)
at java.net.SocketInputStream.read(SocketInputStream.java:122)
at sun.security.ssl.InputRecord.readFully(InputRecord.java:442)
at sun.security.ssl.InputRecord.read(InputRecord.java:480)
at sun.security.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:927)
at sun.security.ssl.SSLSocketImpl.readDataRecord(SSLSocketImpl.java:884)
at sun.security.ssl.AppInputStream.read(AppInputStream.java:102)
at sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283)
at sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325)
at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177)
at java.io.InputStreamReader.read(InputStreamReader.java:184)
at java.io.BufferedReader.fill(BufferedReader.java:154)
at java.io.BufferedReader.readLine(BufferedReader.java:317)
at java.io.BufferedReader.readLine(BufferedReader.java:382)
at org.apache.tomcat.util.net.TestSsl.testRenegotiateWorks(TestSsl.java:206)

Testcase: testRenegotiateFail took 0,004 sec
]]]

Best regards,
Konstantin Kolinko

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



[Bug 56245] Tomcat Set up as a SERVICE does not re-START recovery automatically. And primary to that, does crash. have a piderr file to attach.

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56245

loren_t_laudenb...@optum.com  changed:

   What|Removed |Added

URL||http://apse0417:8100/ew/log
   ||in.jsp

--- Comment #1 from loren_t_laudenb...@optum.com  
---
url I attached is how we USE this Tomcat.

-- 
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 56245] New: Tomcat Set up as a SERVICE does not re-START recovery automatically. And primary to that, does crash. have a piderr file to attach.

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56245

Bug ID: 56245
   Summary: Tomcat Set up as a SERVICE  does not re-START recovery
automatically.   And primary to that, does crash. have
a piderr file to attach.
   Product: Tomcat 7
   Version: 7.0.47
  Hardware: PC
OS: Windows Server 2003
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: loren_t_laudenb...@optum.com

Created attachment 31382
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=31382&action=edit
z3 text is an error file log

see attachment, on a crash .log

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



buildbot failure in ASF Buildbot on tomcat-7-trunk

2014-03-11 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1797

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1576272
Blamelist: kkolinko

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





svn commit: r1576288 - in /tomcat/trunk: java/org/apache/tomcat/util/descriptor/LocalResolver.java webapps/docs/changelog.xml

2014-03-11 Thread markt
Author: markt
Date: Tue Mar 11 11:34:31 2014
New Revision: 1576288

URL: http://svn.apache.org/r1576288
Log:
Add a work-around for XML documents (often TLDs) that only refer to J2EE 
schemas by file name

Modified:
tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java?rev=1576288&r1=1576287&r2=1576288&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/LocalResolver.java Tue 
Mar 11 11:34:31 2014
@@ -37,6 +37,12 @@ public class LocalResolver implements En
 private static final StringManager sm =
 StringManager.getManager(Constants.PACKAGE_NAME);
 
+private static final String[] JAVA_EE_NAMESPACES = {
+XmlIdentifiers.JAVAEE_1_4_NS,
+XmlIdentifiers.JAVAEE_5_NS,
+XmlIdentifiers.JAVAEE_7_NS };
+
+
 private final Map publicIds;
 private final Map systemIds;
 private final boolean blockExternal;
@@ -94,6 +100,18 @@ public class LocalResolver implements En
 return is;
 }
 
+// Work-around for XML documents that use just the file name for the
+// location to refer to a JavaEE schema
+for (String javaEENamespace : JAVA_EE_NAMESPACES) {
+String javaEESystemId = javaEENamespace + '/' + systemId;
+resolved = systemIds.get(javaEESystemId);
+if (resolved != null) {
+InputSource is = new InputSource(resolved);
+is.setPublicId(publicId);
+return is;
+}
+}
+
 // Resolve the supplied systemId against the base
 URI systemUri;
 try {
@@ -133,6 +151,7 @@ public class LocalResolver implements En
 return is;
 }
 }
+
 throw new 
FileNotFoundException(sm.getString("localResolver.unresolvedEntity",
 name, publicId, systemId, base));
 }

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576288&r1=1576287&r2=1576288&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 11 11:34:31 2014
@@ -99,6 +99,11 @@
 56244: Fix MBeans descriptor for WebappClassLoader MBean.
 (kkolinko)
   
+  
+Add a work around for validating XML documents (often TLDs) that use
+just the file name to refer to refer to the JavaEE schema on which they
+are based. (markt)
+  
 
   
   



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



Re: buildbot failure in ASF Buildbot on tomcat-trunk

2014-03-11 Thread Rémy Maucherat
2014-03-10 22:16 GMT+01:00 :

> 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/5571
>
> Buildbot URL: http://ci.apache.org/
>
> Buildslave for this Build: bb-vm_ubuntu
>
> Build Reason: scheduler
> Build Source Stamp: [branch tomcat/trunk] 1576014
> Blamelist: remm
>
> BUILD FAILED: failed compile_1
>

There's one failure with NIO2 and TestWebSocketFrameClient. It's working
for me, and seems to be timeout related. Overall, I'm skeptical about
timeout handling in upgrade mode, since it's pretending not to use IO
timeouts, but NIO still has a write timeout (sometimes, depending on the
code that was run before the upgrade).

This particular test may be taking just a bit too long (the timeout is 5s).
It completes just below 5s when I run it, but takes over 5s on the test
server. Weird ...

Rémy


svn commit: r1576281 - /tomcat/trunk/webapps/docs/changelog.xml

2014-03-11 Thread kkolinko
Author: kkolinko
Date: Tue Mar 11 11:04:32 2014
New Revision: 1576281

URL: http://svn.apache.org/r1576281
Log:
Correct a typo

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576281&r1=1576280&r2=1576281&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 11 11:04:32 2014
@@ -113,7 +113,7 @@
 Patch provided by Amund Elstad. (markt)
   
   
-Adds experimental NIO2 connector. Based on code developed by
+Add experimental NIO2 connector. Based on code developed by
 Nabil Benothman. (remm)
   
 



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



svn commit: r1576280 - /tomcat/trunk/BUILDING.txt

2014-03-11 Thread kkolinko
Author: kkolinko
Date: Tue Mar 11 11:01:05 2014
New Revision: 1576280

URL: http://svn.apache.org/r1576280
Log:
Document the "execute.test.nio2" option.

Modified:
tomcat/trunk/BUILDING.txt

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1576280&r1=1576279&r2=1576280&view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Tue Mar 11 11:01:05 2014
@@ -297,16 +297,17 @@ directory:
 
 output/build/logs
 
-By default the testsuite is run three times to test 3 different
-implementations of Tomcat connectors: BIO, NIO and APR. (If you are not
+By default the testsuite is run four times to test 4 different
+implementations of Tomcat connectors: BIO, NIO, NIO2 and APR. (If you are not
 familiar with Tomcat connectors, see config/http.html in documentation for
 details).
 
-The 3 runs are enabled and disabled individually by the following
+The 4 runs are enabled and disabled individually by the following
 properties, which all are "true" by default:
 
 execute.test.bio=true
 execute.test.nio=true
+execute.test.nio2=true
 execute.test.apr=true
 
 The APR connector can be tested only if Tomcat-Native library binaries are



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



svn commit: r1576272 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml

2014-03-11 Thread kkolinko
Author: kkolinko
Date: Tue Mar 11 10:46:18 2014
New Revision: 1576272

URL: http://svn.apache.org/r1576272
Log:
Merged r1576271 from tomcat/trunk:
Rephrase changelog message

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1576272&r1=1576271&r2=1576272&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 11 10:46:18 2014
@@ -141,9 +141,9 @@
 status page. (markt)
   
   
-Fixed java.lang.NegativeArraySizeException when execute 
the
-command of Expire sessions of manager web application to context in
-which the session timeout is disabled. (kfujino)
+Fixed java.lang.NegativeArraySizeException when using
+"Expire sessions" command in the manager web application on a
+context where the session timeout is disabled. (kfujino)
   
 
   



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



svn commit: r1576271 - /tomcat/trunk/webapps/docs/changelog.xml

2014-03-11 Thread kkolinko
Author: kkolinko
Date: Tue Mar 11 10:44:53 2014
New Revision: 1576271

URL: http://svn.apache.org/r1576271
Log:
Rephrase changelog message

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576271&r1=1576270&r2=1576271&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 11 10:44:53 2014
@@ -170,9 +170,9 @@
 status page. (markt)
   
   
-Fixed java.lang.NegativeArraySizeException when execute 
the
-command of Expire sessions of manager web application to context in
-which the session timeout is disabled. (kfujino)
+Fixed java.lang.NegativeArraySizeException when using
+"Expire sessions" command in the manager web application on a
+context where the session timeout is disabled. (kfujino)
   
 
   



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



[Bug 56244] 8.0.3: In jmxproxy: javax.management.ReflectionException: Cannot find getter method getJarPath

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56244

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
 OS||All

--- Comment #1 from Konstantin Kolinko  ---
Fixed in trunk by r1576263 and will be in 8.0.4.

-- 
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: r1576263 - in /tomcat/trunk: java/org/apache/catalina/loader/mbeans-descriptors.xml webapps/docs/changelog.xml

2014-03-11 Thread kkolinko
Author: kkolinko
Date: Tue Mar 11 10:26:57 2014
New Revision: 1576263

URL: http://svn.apache.org/r1576263
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56244
Fix MBeans descriptor for WebappClassLoader MBean:
The jarPath property on WebappClassLoader has been removed in Tomcat 8.

Modified:
tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml?rev=1576263&r1=1576262&r2=1576263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/mbeans-descriptors.xml Tue Mar 
11 10:26:57 2014
@@ -88,11 +88,6 @@
   description="The URLs of this loader"
  type="[Ljava.net.URL;"/>
 
-
-
   
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576263&r1=1576262&r2=1576263&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 11 10:26:57 2014
@@ -95,6 +95,10 @@
 is permitted) when a call to AsyncContext.complete() takes
 effect. (markt)
   
+  
+56244: Fix MBeans descriptor for WebappClassLoader MBean.
+(kkolinko)
+  
 
   
   



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



[Bug 56244] New: 8.0.3: In jmxproxy: javax.management.ReflectionException: Cannot find getter method getJarPath

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56244

Bug ID: 56244
   Summary: 8.0.3: In jmxproxy:
javax.management.ReflectionException: Cannot find
getter method getJarPath
   Product: Tomcat 8
   Version: 8.0.3
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: knst.koli...@gmail.com

(Already raised on users list by Christopher Schultz. Here is my reproduction
recipe).

Steps to reproduce:
With current 8.0.x:
1. Grant a user the role of manager-jmx

2. Start Tomcat and access the following web page:
http://localhost:8080/manager/jmxproxy

3. The page is displayed successfully, as expected,
but the following errors are logged into catalina.$date.log file:

[[[
11-Mar-2014 13:55:36.048 SEVERE [http-nio-8080-exec-3]
org.apache.catalina.mbeans.MBeanDumper.dumpBeans Error getting attribute
Catalina:type=WebappClassLoader,host=localhost,context=/examples jarPath
 javax.management.ReflectionException: Cannot find getter method getJarPath
at
org.apache.tomcat.util.modeler.ManagedBean.getGetter(ManagedBean.java:461)
at
org.apache.tomcat.util.modeler.BaseModelMBean.getAttribute(BaseModelMBean.java:180)
at
com.sun.jmx.interceptor.DefaultMBeanServerInterceptor.getAttribute(DefaultMBeanServerInterceptor.java:647)
at
com.sun.jmx.mbeanserver.JmxMBeanServer.getAttribute(JmxMBeanServer.java:678)
at org.apache.catalina.mbeans.MBeanDumper.dumpBeans(MBeanDumper.java:82)
at
org.apache.catalina.manager.JMXProxyServlet.listBeans(JMXProxyServlet.java:186)
at
org.apache.catalina.manager.JMXProxyServlet.doGet(JMXProxyServlet.java:122)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:618)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:725)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:301)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.filters.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:108)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:239)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:106)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:615)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:136)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:74)
at
org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:610)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:88)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:526)
at
org.apache.coyote.http11.AbstractHttp11Processor.process(AbstractHttp11Processor.java:1017)
at
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:652)
at
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:222)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1575)
at
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1533)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: java.lang.NoSuchMethodException:
org.apache.catalina.loader.WebappClassLoader.getJarPath()
at java.lang.Class.getMethod(Class.java:1665)
at
org.apache.tomcat.util.modeler.ManagedBean.getGetter(ManagedBean.java:454)
... 32 more
]]]

Expected: No such error messages in the logs.

-- 
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 56239] NullPointerException when finishing response under the Linux traffic control

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56239

--- Comment #4 from Mark Thomas  ---
1. Fix your broken web application - you should not be bundling multiple
versions of the Servlet API in your web application.

2. Please provide a stack trace from the latest stable 7.0.x release. 7.0.39 in
not the latest stable 7.0.x release.

-- 
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 56242] Deploying a Velocity-based web application can thwart Attach API connections for monitoring

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56242

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID
 OS||All

--- Comment #3 from Mark Thomas  ---
If you start Tomcat with -Xverify:none (not something I'd recommend doing) the
problem goes away. This looks like a VisualVM bug that is triggered by one of
the velocity classes.

As an alternative, attach VisualVM and then deploy the Velocity app.

For those wondering how I stumbled across the solution:
1. Google "attach: task_for_pid(23490) failed (5)"
2. Read through the VisualVm bug reports that finds
3. Specifically read this one: https://java.net/jira/browse/VISUALVM-326
4. Experiment with the settings suggested in that report to see which are
actually required

I'd recommend opening a VisalVM bug for this.

I concur that this is a Mac specific error.

-- 
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: r1576241 - /tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java

2014-03-11 Thread remm
Author: remm
Date: Tue Mar 11 09:17:34 2014
New Revision: 1576241

URL: http://svn.apache.org/r1576241
Log:
Use the behavior of the NIO connector if there is a pending write when 
attempting a SSL close (= throw an IOE and expect a real close).

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1576241&r1=1576240&r2=1576241&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Mar 
11 09:17:34 2014
@@ -408,7 +408,7 @@ public class SecureNio2Channel extends N
 } catch (InterruptedException | ExecutionException | TimeoutException 
e) {
 throw new IOException("Remaining data in the network buffer, can't 
send SSL close message, force a close with close(true) instead", e);
 } catch (WritePendingException e) {
-// Ingore
+throw new IOException("Pending write, so remaining data in the 
network buffer, can't send SSL close message, force a close with close(true) 
instead", e);
 }
 //prep the buffer for the close message
 netOutBuffer.clear();
@@ -428,7 +428,7 @@ public class SecureNio2Channel extends N
 } catch (InterruptedException | ExecutionException | TimeoutException 
e) {
 throw new IOException("Remaining data in the network buffer, can't 
send SSL close message, force a close with close(true) instead", e);
 } catch (WritePendingException e) {
-// Ingore
+throw new IOException("Pending write, so remaining data in the 
network buffer, can't send SSL close message, force a close with close(true) 
instead", e);
 }
 
 //is the channel closed?



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

2014-03-11 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1796

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

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1576219
Blamelist: kfujino

Build succeeded!

sincerely,
 -The Buildbot





svn commit: r1576237 [7/7] - in /tomcat/site/trunk/docs/connectors-doc: ./ ajp/ ajp/printer/ generic_howto/ generic_howto/printer/ miscellaneous/ miscellaneous/printer/ news/ news/printer/ printer/ re

2014-03-11 Thread mturk
Modified: tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html?rev=1576237&r1=1576236&r2=1576237&view=diff
==
--- tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html 
(original)
+++ tomcat/site/trunk/docs/connectors-doc/webserver_howto/printer/nes.html Tue 
Mar 11 09:04:46 2014
@@ -1,4 +1,4 @@
-The Apache Tomcat Connector - Webserver HowTo - 
SunOne -- Netscape/iPlanet HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif
 " align="right" alt=" :: Apache Software Foundation" 
border="0">The Apache Tomcat Connector - Webserver 
HowToSunOne -- Netscape/iPlanet HowToIntroduction
+The Apache Tomcat Connector - Webserver HowTo - 
SunOne -- Netscape/iPlanet HowTohttp://tomcat.apache.org/";>http://www.apache.org/";>http://www.apache.org/images/asf-logo.gif
 " align="right" alt=" :: Apache Software Foundation" 
border="0">The Apache Tomcat Connector - Webserver 
HowToSunOne -- Netscape/iPlanet HowToIntroduction
 
 This document explains how to set up Sun ONE Web Server previously known as
 Netscape web servers to cooperate with Tomcat. 
@@ -51,7 +51,7 @@ WINNT 2000/XP/2003 (should be able to wo
 Sun ONE Web Server 6.1
 
 
-Tomcat 4.1.x , Tomcat 5.0.x and Tomcat 5.5.x
+Tomcat 4.1 to Tomcat 8.
 
 
 
@@ -70,7 +70,7 @@ The ajp12 protocol is only available in 
 
 
 The ajp12 has been deprecated with Tomcat 3.3.x and you should 
use instead 
-ajp13 which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x, 
5.0.x, 5.5.x and 6.
+ajp13 which is the only ajp protocol known by Tomcat 4 and above.
 
 
 
@@ -478,5 +478,5 @@ Make the source with gmake.
 After the build, you will have the required nsapi_redirector.so plugin.
 
 
-Copyright © 1999-2012, Apache Software Foundation
+Copyright © 1999-2014, Apache Software Foundation
 
\ No newline at end of file



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



svn commit: r1576235 - /tomcat/site/trunk/xdocs/download-connectors.xml

2014-03-11 Thread mturk
Author: mturk
Date: Tue Mar 11 09:01:56 2014
New Revision: 1576235

URL: http://svn.apache.org/r1576235
Log:
Update connectors download versions and signing key

Modified:
tomcat/site/trunk/xdocs/download-connectors.xml

Modified: tomcat/site/trunk/xdocs/download-connectors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-connectors.xml?rev=1576235&r1=1576234&r2=1576235&view=diff
==
--- tomcat/site/trunk/xdocs/download-connectors.xml (original)
+++ tomcat/site/trunk/xdocs/download-connectors.xml Tue Mar 11 09:01:56 2014
@@ -50,28 +50,28 @@
   Source (please choose the 
correct format for your platform)
   
 
-  
-JK 1.2.37 Source Release tar.gz
+  
+JK 1.2.39 Source Release tar.gz
(e.g. Unix, Linux, Mac OS)
 
   
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.asc";>PGP]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc";>PGP]
   
   
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.tar.gz.md5";>MD5]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.md5";>MD5]
   
 
 
 
-  
-JK 1.2.37 Source Release zip
+  
+JK 1.2.39 Source Release zip
(e.g. Windows)
 
   
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.asc";>PGP]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.asc";>PGP]
   
   
-[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.37-src.zip.md5";>MD5]
+[https://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.zip.md5";>MD5]
   
 
 
@@ -88,7 +88,7 @@
   
 
 
-tomcat-connectors-1.2.37-src.* is signed by Mladen Turk 
(564C17A3).
+tomcat-connectors-1.2.39-src.* is signed by Mladen Turk 
(0D498E23).
 
   
 



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



svn commit: r1576234 - in /tomcat/jk/trunk: native/STATUS.txt xdocs/index.xml xdocs/news/20140201.xml

2014-03-11 Thread mturk
Author: mturk
Date: Tue Mar 11 08:54:52 2014
New Revision: 1576234

URL: http://svn.apache.org/r1576234
Log:
Add release notes

Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/news/20140201.xml

Modified: tomcat/jk/trunk/native/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1576234&r1=1576233&r2=1576234&view=diff
==
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Tue Mar 11 08:54:52 2014
@@ -19,7 +19,7 @@ Last modified at [$Date$]
 Release:
 
 1.2.40  : in development
-1.2.39  : in release process
+1.2.39  : released March 11, 2014
 1.2.38  : not released
 1.2.37  : released May 31, 2012
 1.2.36  : released May 14, 2012

Modified: tomcat/jk/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1576234&r1=1576233&r2=1576234&view=diff
==
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Tue Mar 11 08:54:52 2014
@@ -45,6 +45,18 @@ manual is described in more detail below
 
 
 
+11 March 2014 - 
JK-1.2.39 released
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.39 Stable. This release contains bug fixes found 
in previous releases
+and few new features.
+
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz";>JK
 1.2.39 release sources
+| http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.39-src.tar.gz.asc";>PGP
 signature
+
+Download the http://www.apache.org/dist/tomcat/tomcat-connectors/jk/binaries/";>binaries
 for selected platforms.
+
+
+
 31 May 2012 - 
JK-1.2.37 released
 The Apache Tomcat team is proud to announce the immediate availability
 of Tomcat Connectors 1.2.37 Stable. This release contains bug fixes found 
in previous release.

Modified: tomcat/jk/trunk/xdocs/news/20140201.xml
URL: 
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/20140201.xml?rev=1576234&r1=1576233&r2=1576234&view=diff
==
--- tomcat/jk/trunk/xdocs/news/20140201.xml (original)
+++ tomcat/jk/trunk/xdocs/news/20140201.xml Tue Mar 11 08:54:52 2014
@@ -31,6 +31,21 @@
 
 
 
+
+
+
+The Apache Tomcat team is proud to announce the immediate availability
+of Tomcat Connectors 1.2.39. This is a stable release containing both 
bug fixes and
+few new features like IPV6 support. Note that version 1.2.38 was not 
released due to
+some minor issues found in release process.
+
+Please see the ChangeLog 
for a full list of changes.
+
+If you find any bugs while using this release, please fill in the
+https://issues.apache.org/bugzilla/enter_bug.cgi?product=Tomcat%20Connectors";>Bugzilla
+Bug Report.
+
+
 
 
 



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



svn commit: r1576219 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2014-03-11 Thread kfujino
Author: kfujino
Date: Tue Mar 11 08:00:47 2014
New Revision: 1576219

URL: http://svn.apache.org/r1576219
Log:
Fixed java.lang.NegativeArraySizeException when execute the command of Expire 
sessions of manager web application to context in which the session timeout is 
disabled.

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1576219&r1=1576218&r2=1576219&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/manager/ManagerServlet.java 
Tue Mar 11 08:00:47 2014
@@ -1121,16 +1121,18 @@ public class ManagerServlet extends Http
 return;   
 }
 int maxCount = 60;
+int histoInterval = 1;
 int maxInactiveInterval = manager.getMaxInactiveInterval()/60;
-int histoInterval = maxInactiveInterval / maxCount;
-if ( histoInterval * maxCount < maxInactiveInterval ) 
-histoInterval++;
-if (0==histoInterval)
-histoInterval=1;
-maxCount = maxInactiveInterval / histoInterval;
-if ( histoInterval * maxCount < maxInactiveInterval ) 
-maxCount++;
-
+if (maxInactiveInterval > 0) {
+histoInterval = maxInactiveInterval / maxCount;
+if (histoInterval * maxCount < maxInactiveInterval)
+histoInterval++;
+if (0 == histoInterval)
+histoInterval = 1;
+maxCount = maxInactiveInterval / histoInterval;
+if (histoInterval * maxCount < maxInactiveInterval)
+maxCount++;
+}
 writer.println(smClient.getString("managerServlet.sessions",
 displayPath));
 writer.println(smClient.getString(

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1576219&r1=1576218&r2=1576219&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Mar 11 08:00:47 2014
@@ -140,6 +140,11 @@
 table cell containing the request information on the Manager 
application
 status page. (markt)
   
+  
+Fixed java.lang.NegativeArraySizeException when execute 
the
+command of Expire sessions of manager web application to context in
+which the session timeout is disabled. (kfujino)
+  
 
   
   



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



svn commit: r1576218 - in /tomcat/trunk: java/org/apache/catalina/manager/ManagerServlet.java webapps/docs/changelog.xml

2014-03-11 Thread kfujino
Author: kfujino
Date: Tue Mar 11 07:59:08 2014
New Revision: 1576218

URL: http://svn.apache.org/r1576218
Log:
Fixed java.lang.NegativeArraySizeException when execute the command of Expire 
sessions of manager web application to context in which the session timeout is 
disabled.

Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1576218&r1=1576217&r2=1576218&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue Mar 
11 07:59:08 2014
@@ -1146,15 +1146,18 @@ public class ManagerServlet extends Http
 return;
 }
 int maxCount = 60;
+int histoInterval = 1;
 int maxInactiveInterval = manager.getMaxInactiveInterval()/60;
-int histoInterval = maxInactiveInterval / maxCount;
-if ( histoInterval * maxCount < maxInactiveInterval )
-histoInterval++;
-if (0==histoInterval)
-histoInterval=1;
-maxCount = maxInactiveInterval / histoInterval;
-if ( histoInterval * maxCount < maxInactiveInterval )
-maxCount++;
+if (maxInactiveInterval > 0) {
+histoInterval = maxInactiveInterval / maxCount;
+if (histoInterval * maxCount < maxInactiveInterval)
+histoInterval++;
+if (0 == histoInterval)
+histoInterval = 1;
+maxCount = maxInactiveInterval / histoInterval;
+if (histoInterval * maxCount < maxInactiveInterval)
+maxCount++;
+}
 
 writer.println(smClient.getString("managerServlet.sessions",
 displayPath));

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1576218&r1=1576217&r2=1576218&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Mar 11 07:59:08 2014
@@ -165,6 +165,11 @@
 table cell containing the request information on the Manager 
application
 status page. (markt)
   
+  
+Fixed java.lang.NegativeArraySizeException when execute 
the
+command of Expire sessions of manager web application to context in
+which the session timeout is disabled. (kfujino)
+  
 
   
   



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



[Bug 56239] NullPointerException when finishing response under the Linux traffic control

2014-03-11 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56239

--- Comment #2 from Lsk  ---
Created attachment 31380
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=31380&action=edit
stacktrace

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