Re: Unit tests and trunk

[Mark Thomas]

On 12/07/2012 02:05, Filip Hanik wrote:
 I can reproduce the bug in both our unit tests and the original bug report. 
 further more I can turn non blocking into blocking by opening an closing a 
 selector that is never used. 
 
 definitely a bug, since a jvm/network flag resolves it. 
 
 while your vm may support ipv6, there is still an additional software layer.

Indeed and all are present. The reason I said it claims to support IPv6
is that I hadn't tested it to confirm what the OS was claiming was
indeed true.

 I'm sure there will be more bug reports as more people turn to java 7 on 
 windows/hardware

Yep.

Mark

 
 Sent from my iPhone
 
 On Jul 11, 2012, at 16:42, Mark Thomas ma...@apache.org wrote:
 
 On 11/07/2012 23:30, Filip Hanik (mailing lists) wrote:
 I wasn't able to reproduce on a Win 7 VM because the VM environment itself
 doesn't support IPv6

 Given who we work for, the opportunities for humorous comments is
 extensive :)

 I'll settle for saying that I've double checked the VM I have and it
 does (claim to) support IPv6. I'll try out the test case provided in the
 original bug report.

 Mark

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

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



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

Re: Missing classes in stock 5.5.35 JARs?

[Mark Thomas]

On 12/07/2012 01:25, Christopher Schultz wrote:
 All,
 
 http://stackoverflow.com/questions/11427522/ssl-configuration-getting-classpuretlsimplementation-jsse15factory-not-foun

  The SO poster is using 5.5.30 but the problem appears to still
 exist in 5.5.35 (latest).
 
 I downloaded the core Tomcat 5.5.35 tarball and none of the .jar
 files in there contain the PureTLSImplementation class (nor any of
 the JSSE15*.class files). JSSE14*.class are there, in 
 server/lib/tomcat-util.jar.
 
 svn doesn't say anything about those files being removed -- the
 sources are still in there.
 
 Did something get left out in the build, somehow?

Nope. Those are debug messages indicating that optional libraries are
not present and can be safely ignored. PureTLS has so little demand
from the user community these days that we stopped including it in the
build years ago.

Mark

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

Re: access to build environment

[Mark Thomas]

On 12/07/2012 02:06, Filip Hanik wrote:
 I'd guess those two, do we use anything else for tomcat ci?

Not on ASF infrastructure.

The first step is to get trunk building with 1.7. It doesn't at the
moment because of some jdbc-pool tests that implement some of the SQL
interfaces. Fix those and we can change the source version in the build
and see what breaks. Gump we can fix directly. buildbot we may need to
ask infra to fix (whch means I might have the karma to fix it anyway).

Mark

 
 Sent from my iPhone
 
 On Jul 11, 2012, at 16:42, Mark Thomas ma...@apache.org wrote:
 
 On 11/07/2012 23:40, Filip Hanik (mailing lists) wrote:
 How do I get access to the build environment?

 Which build environment? Gump, buildbot, something else?

 Mark


 So we can change the build to default to Java 7

 Filip




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




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

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



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

svn commit: r1360606 - in /tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver: Connection.java Driver.java ResultSet.java Statement.java

[markt]

Author: markt
Date: Thu Jul 12 09:56:17 2012
New Revision: 1360606

URL: http://svn.apache.org/viewvc?rev=1360606view=rev
Log:
Get jdbc-pool tests compiling with Java 7

Modified:

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java?rev=1360606r1=1360605r2=1360606view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
 Thu Jul 12 09:56:17 2012
@@ -32,6 +32,7 @@ import java.sql.Statement;
 import java.sql.Struct;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.Executor;
 
 import org.apache.tomcat.jdbc.pool.PooledConnection;
 
@@ -284,4 +285,25 @@ public class Connection implements java.
 return null;
 }
 
+// -- Java 7 
methods
+// Can't add @Override annotations since this code also has to compile with
+// Java 6 for Tomcat 7.
+
+public void setSchema(String schema) throws SQLException {
+}
+
+public String getSchema() throws SQLException {
+return null;
+}
+
+public void abort(Executor executor) throws SQLException {
+}
+
+public void setNetworkTimeout(Executor executor, int milliseconds)
+throws SQLException {
+}
+
+public int getNetworkTimeout() throws SQLException {
+return 0;
+}
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java?rev=1360606r1=1360605r2=1360606view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
 Thu Jul 12 09:56:17 2012
@@ -20,8 +20,10 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Logger;
 
 public class Driver implements java.sql.Driver {
 public static final String url = jdbc:tomcat:test;
@@ -75,4 +77,13 @@ public class Driver implements java.sql.
 public boolean jdbcCompliant() {
 return false;
 }
+
+// -- Java 7 
methods
+// Can't add @Override annotations since this code also has to compile with
+// Java 6 for Tomcat 7.
+
+@Override
+public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+return null;
+}
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java?rev=1360606r1=1360605r2=1360606view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java
 Thu Jul 12 09:56:17 2012
@@ -1208,4 +1208,16 @@ public class ResultSet implements java.s
 return null;
 }
 
+// -- Java 7 
methods
+// Can't add @Override annotations since this code also has to compile with
+// Java 6 for Tomcat 7.
+
+public T T getObject(int columnIndex, ClassT type) throws SQLException 
{
+return null;
+}
+
+public T T getObject(String columnLabel, ClassT type)
+throws SQLException {
+return null;
+}
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java?rev=1360606r1=1360605r2=1360606view=diff

svn commit: r1360608 - /tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java

[markt]

Author: markt
Date: Thu Jul 12 09:57:32 2012
New Revision: 1360608

URL: http://svn.apache.org/viewvc?rev=1360608view=rev
Log:
Fix import order

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java

Modified: tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java?rev=1360608r1=1360607r2=1360608view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestSendFile.java Thu Jul 
12 09:57:32 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.catalina.connector;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -34,12 +32,14 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.Globals;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.util.buf.ByteChunk;
-import org.junit.Test;
 
 public class TestSendFile extends TomcatBaseTest{
 



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

svn commit: r1360609 - in /tomcat/trunk/java/org/apache/coyote: http11/NpnHandler.java spdy/SpdyAprNpnHandler.java

[markt]

Author: markt
Date: Thu Jul 12 10:02:15 2012
New Revision: 1360609

URL: http://svn.apache.org/viewvc?rev=1360609view=rev
Log:
Fix some generics warnings

Modified:
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java?rev=1360609r1=1360608r2=1360609view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java Thu Jul 12 
10:02:15 2012
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.net.Socket
  * Interface specific for protocols that negotiate at NPN level, like
  * SPDY. This is only available for APR, will replace the HTTP framing.
  */
-public interface NpnHandler {
+public interface NpnHandlerT {
 
 /**
  * Check if the socket has negotiated the right NPN and process it.
@@ -37,7 +37,7 @@ public interface NpnHandler {
  * @return OPEN if the socket doesn't have the right npn.
  *CLOSE if processing is done. LONG to request read polling.
  */
-SocketState process(SocketWrapper? socket, SocketStatus status);
+SocketState process(SocketWrapperT socket, SocketStatus status);
 
 /**
  * Initialize the npn handler.

Modified: tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java?rev=1360609r1=1360608r2=1360609view=diff
==
--- tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java (original)
+++ tomcat/trunk/java/org/apache/coyote/spdy/SpdyAprNpnHandler.java Thu Jul 12 
10:02:15 2012
@@ -58,7 +58,7 @@ import org.apache.tomcat.util.net.Socket
  * negotiated by TLS.
  *
  */
-public class SpdyAprNpnHandler implements NpnHandler {
+public class SpdyAprNpnHandler implements NpnHandlerLong {
 
 private static final Log log = LogFactory.getLog(AprEndpoint.class);
 
@@ -90,12 +90,12 @@ public class SpdyAprNpnHandler implement
 }
 
 @Override
-public SocketState process(SocketWrapper? socketO, SocketStatus status) {
+public SocketState process(SocketWrapperLong socketWrapper,
+SocketStatus status) {
 
-SocketWrapperLong socketW = (SocketWrapperLong) socketO;
-long socket = socketW.getSocket().longValue();
+long socket = socketWrapper.getSocket().longValue();
 
-if (! spdyContext.getNetSupport().isSpdy(socketW.getSocket())) {
+if (! spdyContext.getNetSupport().isSpdy(socketWrapper.getSocket())) {
 return SocketState.OPEN;
 }
 



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

svn commit: r1360611 - /tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java

[markt]

Author: markt
Date: Thu Jul 12 10:07:48 2012
New Revision: 1360611

URL: http://svn.apache.org/viewvc?rev=1360611view=rev
Log:
Fix a handful of Eclipse warnings

Modified:
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java

Modified: 
tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java?rev=1360611r1=1360610r2=1360611view=diff
==
--- tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java 
Thu Jul 12 10:07:48 2012
@@ -40,7 +40,6 @@ import javax.servlet.http.HttpServletRes
 import org.junit.Assert;
 import org.junit.Test;
 
-import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.BytesStreamer;
 import org.apache.catalina.startup.TesterServlet;
@@ -73,7 +72,7 @@ public class TestNonBlockingAPI extends 
 
 NBReadServlet servlet = new NBReadServlet();
 String servletName = NBReadServlet.class.getName();
-Wrapper servletWrapper = tomcat.addServlet(ctx, servletName, servlet);
+Tomcat.addServlet(ctx, servletName, servlet);
 ctx.addServletMapping(/, servletName);
 
 tomcat.start();
@@ -94,7 +93,7 @@ public class TestNonBlockingAPI extends 
 
 NBWriteServlet servlet = new NBWriteServlet();
 String servletName = NBWriteServlet.class.getName();
-Wrapper servletWrapper = tomcat.addServlet(ctx, servletName, servlet);
+Tomcat.addServlet(ctx, servletName, servlet);
 ctx.addServletMapping(/, servletName);
 tomcat.getConnector().setProperty(socket.txBufSize, 1024);
 tomcat.getConnector().setProperty(address, bind);
@@ -124,7 +123,7 @@ public class TestNonBlockingAPI extends 
 } else if (delta  (bytesToDownload / 16)) {
 System.out.println(Read  + counter +  bytes.);
 delta = 0;
-Thread.currentThread().sleep(500);
+Thread.sleep(500);
 }
 } catch (Exception x) {
 throw new IOException(x);
@@ -148,7 +147,7 @@ public class TestNonBlockingAPI extends 
 
 NBWriteServlet servlet = new NBWriteServlet();
 String servletName = NBWriteServlet.class.getName();
-Wrapper servletWrapper = tomcat.addServlet(ctx, servletName, servlet);
+Tomcat.addServlet(ctx, servletName, servlet);
 ctx.addServletMapping(/, servletName);
 tomcat.getConnector().setProperty(socket.txBufSize, 1024);
 tomcat.getConnector().setProperty(address, bind);
@@ -178,14 +177,14 @@ public class TestNonBlockingAPI extends 
 } else if (delta  (bytesToDownload / 16)) {
 System.out.println(Read  + counter +  bytes.);
 delta = 0;
-Thread.currentThread().sleep(500);
+Thread.sleep(500);
 }
 } catch (Exception x) {
 throw new IOException(x);
 }
 }
 });
-int rc = postUrlWithDisconnect(true, new DataWriter(0), http://; + 
bind + : + getPort() + /, slowReader, resHeaders,
+int rc = postUrlWithDisconnect(true, new DataWriter(0), http://; + 
bind + : + getPort() + /, resHeaders,
 null);
 slowReader.flushBuffer();
 Assert.assertEquals(HttpServletResponse.SC_OK, rc);
@@ -248,6 +247,7 @@ public class TestNonBlockingAPI extends 
 
 @WebServlet(asyncSupported = true)
 public class NBReadServlet extends TesterServlet {
+private static final long serialVersionUID = 1L;
 public volatile TestReadListener listener;
 @Override
 protected void service(HttpServletRequest req, HttpServletResponse 
resp) throws ServletException, IOException {
@@ -299,6 +299,7 @@ public class TestNonBlockingAPI extends 
 
 @WebServlet(asyncSupported = true)
 public class NBWriteServlet extends TesterServlet {
+private static final long serialVersionUID = 1L;
 public volatile TestWriteListener wlistener;
 public volatile TestReadListener rlistener;
 
@@ -348,7 +349,6 @@ public class TestNonBlockingAPI extends 
 }
 private class TestReadListener implements ReadListener {
 AsyncContext ctx;
-public volatile boolean onErrorInvoked = false;
 
 public TestReadListener(AsyncContext ctx) {
 this.ctx = ctx;
@@ -389,8 +389,6 @@ public class TestNonBlockingAPI extends 
 public void onError(Throwable throwable) {
 System.out.println(ReadListener.onError);
 throwable.printStackTrace();
-

svn commit: r1360615 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11JsseProtocol.java AbstractHttp11Protocol.java Http11AprProtocol.java Http11NioProtocol.java Http11Protocol.java Npn

[markt]

Author: markt
Date: Thu Jul 12 10:18:20 2012
New Revision: 1360615

URL: http://svn.apache.org/viewvc?rev=1360615view=rev
Log:
Fix more warnings
 - More generics for npn
 - Use final where appropriate

Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/trunk/java/org/apache/coyote/http11/NpnHandler.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java?rev=1360615r1=1360614r2=1360615view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11JsseProtocol.java 
Thu Jul 12 10:18:20 2012
@@ -18,8 +18,8 @@ package org.apache.coyote.http11;
 
 import org.apache.tomcat.util.net.SSLImplementation;
 
-public abstract class AbstractHttp11JsseProtocol
-extends AbstractHttp11Protocol {
+public abstract class AbstractHttp11JsseProtocolS
+extends AbstractHttp11ProtocolS {
 
 protected SSLImplementation sslImplementation = null;
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1360615r1=1360614r2=1360615view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu 
Jul 12 10:18:20 2012
@@ -18,16 +18,8 @@ package org.apache.coyote.http11;
 
 
 import org.apache.coyote.AbstractProtocol;
-import org.apache.tomcat.util.res.StringManager;
-
-public abstract class AbstractHttp11Protocol extends AbstractProtocol {
-
-/**
- * The string manager for this package.
- */
-protected static final StringManager sm =
-StringManager.getManager(Constants.Package);
 
+public abstract class AbstractHttp11ProtocolS extends AbstractProtocol {
 
 @Override
 protected String getProtocolName() {
@@ -184,11 +176,12 @@ public abstract class AbstractHttp11Prot
 endpoint.setMaxKeepAliveRequests(mkar);
 }
 
-protected NpnHandler npnHandler;
+protected NpnHandlerS npnHandler;
+@SuppressWarnings(unchecked)
 public void setNpnHandler(String impl) {
 try {
 Class? c = Class.forName(impl);
-npnHandler = (NpnHandler) c.newInstance();
+npnHandler = (NpnHandlerS) c.newInstance();
 } catch (Exception ex) {
 getLog().warn(Failed to init light protocol  + impl, ex);
 }

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1360615r1=1360614r2=1360615view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Thu Jul 
12 10:18:20 2012
@@ -39,7 +39,7 @@ import org.apache.tomcat.util.net.Socket
  * @author Remy Maucherat
  * @author Costin Manolache
  */
-public class Http11AprProtocol extends AbstractHttp11Protocol {
+public class Http11AprProtocol extends AbstractHttp11ProtocolLong {
 
 private static final Log log = LogFactory.getLog(Http11AprProtocol.class);
 

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1360615r1=1360614r2=1360615view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Thu Jul 
12 10:18:20 2012
@@ -47,7 +47,7 @@ import org.apache.tomcat.util.net.Socket
  * @author Costin Manolache
  * @author Filip Hanik
  */
-public class Http11NioProtocol extends AbstractHttp11JsseProtocol {
+public class Http11NioProtocol extends AbstractHttp11JsseProtocolNioChannel {
 
 private static final Log log = LogFactory.getLog(Http11NioProtocol.class);
 
@@ -86,7 +86,7 @@ public class Http11NioProtocol extends A
 
 //  Properties
 
-private Http11ConnectionHandler cHandler;
+private final Http11ConnectionHandler cHandler;
 
 //  Pool 

svn commit: r1360616 - /tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java

[markt]

Author: markt
Date: Thu Jul 12 10:19:57 2012
New Revision: 1360616

URL: http://svn.apache.org/viewvc?rev=1360616view=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java?rev=1360616r1=1360615r2=1360616view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioOutputBuffer.java Thu 
Jul 12 10:19:57 2012
@@ -334,7 +334,6 @@ public class InternalNioOutputBuffer ext
  */
 protected boolean flushBuffer(boolean block) throws IOException {
 
-int result = 0;
 //prevent timeout for async,
 SelectionKey key = 
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
 if (key != null) {
@@ -345,8 +344,8 @@ public class InternalNioOutputBuffer ext
 boolean dataLeft = hasMoreDataToFlush();
 
 //write to the socket, if there is anything to write
-if ( dataLeft ) {
-result = 
writeToSocket(socket.getBufHandler().getWriteBuffer(),block, !flipped);
+if (dataLeft) {
+writeToSocket(socket.getBufHandler().getWriteBuffer(),block, 
!flipped);
 }
 
 dataLeft = hasMoreDataToFlush();
@@ -360,10 +359,9 @@ public class InternalNioOutputBuffer ext
 transfer(buffer.getBuf(), 
socket.getBufHandler().getWriteBuffer());
 if (buffer.getBuf().remaining() == 0) {
 bufIter.remove();
-}
-result = 
writeToSocket(socket.getBufHandler().getWriteBuffer(),block, true);
+}
+
writeToSocket(socket.getBufHandler().getWriteBuffer(),block, true);
 //here we must break if we didn't finish the write
-
 }
 }
 }



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

svn commit: r1360618 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket: AprSocket.java AprSocketContext.java

[markt]

Author: markt
Date: Thu Jul 12 10:30:44 2012
New Revision: 1360618

URL: http://svn.apache.org/viewvc?rev=1360618view=rev
Log:
Clean up debug logging

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618r1=1360617r2=1360618view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu Jul 12 
10:30:44 2012
@@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS
  */
 public class AprSocket implements Runnable {
 
-static final byte[][] NO_CERTS = new byte[0][];
+private static final Logger log =
+Logger.getLogger(org.apache.tomcat.jni.socket.AprSocket);
 
-static Logger log = Logger.getLogger(AprSocket);
+static final byte[][] NO_CERTS = new byte[0][];
 
 static int CONNECTING = 1;
 static int CONNECTED = 0x2;
@@ -280,7 +281,7 @@ public class AprSocket implements Runnab
 updatePolling();
 return rt;
 }
-if (context.debug) {
+if (log.isLoggable(Level.WARNING)) {
 log.warning(apr.send(): Failed to send, closing  + sent);
 }
 reset();
@@ -407,7 +408,7 @@ public class AprSocket implements Runnab
 if (context.rawDataHandler != null) {
 context.rawDataHandler.rawData(this, false, null, -1, -1, -1, 
true);
 }
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
 log.info(closing: context.open= + context.open.get() +   + 
this);
 }
 
@@ -725,7 +726,7 @@ public class AprSocket implements Runnab
 try {
 context.open.incrementAndGet();
 
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
 log.info(Accept:  + context.open.get() +   + this 
+   +
 getRemotePort());
 }
@@ -795,7 +796,7 @@ public class AprSocket implements Runnab
 }
 
 try {
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
 log.info(this +  StartSSL);
 }
 
@@ -851,7 +852,7 @@ public class AprSocket implements Runnab
 int ticketLen = SSLExt.getTicket(socket, hostInfo.ticket);
 if (ticketLen  0) {
 hostInfo.ticketLen = ticketLen;
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
 log.info(Received ticket:  + ticketLen);
 }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1360618r1=1360617r2=1360618view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Thu 
Jul 12 10:30:44 2012
@@ -184,7 +184,6 @@ public class AprSocketContext {
 // Separate executor for connect/handshakes
 ExecutorService connectExecutor;
 
-boolean debug = false;
 boolean debugSSL = false;
 boolean debugPoll = false;
 



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

Re: svn commit: r1360618 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket: AprSocket.java AprSocketContext.java

[Rainer Jung]

On 12.07.2012 12:30, ma...@apache.org wrote:

Author: markt
Date: Thu Jul 12 10:30:44 2012
New Revision: 1360618

URL: http://svn.apache.org/viewvc?rev=1360618view=rev
Log:
Clean up debug logging

Modified:
 tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
 tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618r1=1360617r2=1360618view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu Jul 12 
10:30:44 2012
@@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS
   */
  public class AprSocket implements Runnable {

-static final byte[][] NO_CERTS = new byte[0][];
+private static final Logger log =
+Logger.getLogger(org.apache.tomcat.jni.socket.AprSocket);

-static Logger log = Logger.getLogger(AprSocket);
+static final byte[][] NO_CERTS = new byte[0][];

  static int CONNECTING = 1;
  static int CONNECTED = 0x2;
@@ -280,7 +281,7 @@ public class AprSocket implements Runnab
  updatePolling();
  return rt;
  }
-if (context.debug) {
+if (log.isLoggable(Level.WARNING)) {


debug  warning replaced by unconditional WARNING?
In all other cases you changed debug  info to FINE.


  log.warning(apr.send(): Failed to send, closing  + sent);
  }
  reset();
@@ -407,7 +408,7 @@ public class AprSocket implements Runnab
  if (context.rawDataHandler != null) {
  context.rawDataHandler.rawData(this, false, null, -1, -1, -1, 
true);
  }
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
  log.info(closing: context.open= + context.open.get() +   
+ this);
  }

@@ -725,7 +726,7 @@ public class AprSocket implements Runnab
  try {
  context.open.incrementAndGet();

-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
  log.info(Accept:  + context.open.get() +   + this +  
 +
  getRemotePort());
  }
@@ -795,7 +796,7 @@ public class AprSocket implements Runnab
  }

  try {
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
  log.info(this +  StartSSL);
  }

@@ -851,7 +852,7 @@ public class AprSocket implements Runnab
  int ticketLen = SSLExt.getTicket(socket, hostInfo.ticket);
  if (ticketLen  0) {
  hostInfo.ticketLen = ticketLen;
-if (context.debug) {
+if (log.isLoggable(Level.FINE)) {
  log.info(Received ticket:  + ticketLen);
  }
  }



Regards,

Rainer

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

Current unit test behaviour for trunk using Java 7 on Solaris

[Rainer Jung]

Versions


TC trunk r1360616 tested with Java 1.7.0_05 on Solaris 10 Sparc.

Compiled everything with the same JVM version using

compile.source=1.7
compile.target=1.7

except for DBCP which was compiled with Java 6.

Unit test failures
==

One test failure, namely org.apache.catalina.websocket.TestWebSocket for 
NIO:


Testcase: testKey took 4.628 sec
Testcase: testBug53339 took 0.262 sec
Testcase: testSimple took 0.585 sec
FAILED

junit.framework.AssertionFailedError:
at 
org.apache.catalina.websocket.TestWebSocket$WebSocketClient.readMessage(TestWebSocket.java:419)
at 
org.apache.catalina.websocket.TestWebSocket$WebSocketClient.access$300(TestWebSocket.java:343)
at 
org.apache.catalina.websocket.TestWebSocket.testSimple(TestWebSocket.java:99)


Testcase: testNoConnection took 0.555 sec
Testcase: testNoUpgrade took 0.425 sec
Testcase: testDetectWrongVersion took 0.377 sec

possibly due to the following exception which is not happening for BIO 
and APR (negative Timeout):


[junit] 12-Jul-2012 13:19:24.329 INFO [main] 
org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler 
[http-nio-127.0.0.1-auto-2-48250]
[junit] 12-Jul-2012 13:19:24.330 SEVERE 
[http-nio-127.0.0.1-auto-2-exec-1] 
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process null

[junit]  java.lang.IllegalArgumentException: Negative timeout
[junit] at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
[junit] at 
org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267)
[junit] at 
org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227)
[junit] at 
org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeNioProcessor.java:139)
[junit] at 
org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProcessor.java:112)
[junit] at 
org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:213)
[junit] at 
org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java:68)
[junit] at 
org.apache.catalina.websocket.StreamInbound.onData(StreamInbound.java:117)
[junit] at 
org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(UpgradeProcessor.java:83)
[junit] at 
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:583)
[junit] at 
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223)
[junit] at 
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1676)
[junit] at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
[junit] at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)

[junit] at java.lang.Thread.run(Thread.java:722)
[junit]
[junit] 12-Jul-2012 13:19:24.381 INFO [main] 
org.apache.catalina.core.StandardService.stopInternal Stopping service 
Tomcat


...

[junit] 12-Jul-2012 13:19:24.769 INFO [main] 
org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler 
[http-nio-127.0.0.1-auto-3-48253]
[junit] 12-Jul-2012 13:19:24.795 SEVERE 
[http-nio-127.0.0.1-auto-3-exec-1] 
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process null

[junit]  java.lang.IllegalArgumentException: Negative timeout
[junit] at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
[junit] at 
org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267)
[junit] at 
org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227)
[junit] at 
org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeNioProcessor.java:139)
[junit] at 
org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProcessor.java:98)
[junit] at 
org.apache.catalina.websocket.WsFrame.blockingRead(WsFrame.java:149)
[junit] at 
org.apache.catalina.websocket.WsFrame.init(WsFrame.java:66)
[junit] at 
org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:215)
[junit] at 
org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java:68)
[junit] at 
org.apache.catalina.websocket.WsInputStream.makePayloadDataAvailable(WsInputStream.java:136)
[junit] at 
org.apache.catalina.websocket.WsInputStream.read(WsInputStream.java:103)
[junit] at 
sun.nio.cs.StreamDecoder.readBytes(StreamDecoder.java:283)
[junit] at 
sun.nio.cs.StreamDecoder.implRead(StreamDecoder.java:325)

[junit] at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:177)
[junit] at sun.nio.cs.StreamDecoder.read0(StreamDecoder.java:126)
[junit] at sun.nio.cs.StreamDecoder.read(StreamDecoder.java:112)
[junit] at 
java.io.InputStreamReader.read(InputStreamReader.java:168)
[junit] at 

Re: Missing classes in stock 5.5.35 JARs?

[Jim Jagielski]

On Jul 11, 2012, at 8:25 PM, Christopher Schultz wrote:

 All,
 
 http://stackoverflow.com/questions/11427522/ssl-configuration-getting-classpuretlsimplementation-jsse15factory-not-foun
 
 The SO poster is using 5.5.30 but the problem appears to still exist in
 5.5.35 (latest).
 
 I downloaded the core Tomcat 5.5.35 tarball and none of the .jar files
 in there contain the PureTLSImplementation class (nor any of the
 JSSE15*.class files). JSSE14*.class are there, in
 server/lib/tomcat-util.jar.
 
 svn doesn't say anything about those files being removed -- the sources
 are still in there.
 
 Did something get left out in the build, somehow?
 

Well, on purpose, yeah. We have not shipped it in the
release builds for quite some time, due to no demand, need
and support for it.


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

RE: access to build environment

[Filip Hanik (mailing lists)]

 -Original Message-
 From: Mark Thomas [mailto:ma...@apache.org]
 Sent: Thursday, July 12, 2012 1:33 AM
 To: Tomcat Developers List
 Subject: Re: access to build environment
 
 On 12/07/2012 02:06, Filip Hanik wrote:
  I'd guess those two, do we use anything else for tomcat ci?
 
 Not on ASF infrastructure.
 
 The first step is to get trunk building with 1.7. It doesn't at the
 moment because of some jdbc-pool tests that implement some of the SQL
 interfaces. Fix those and we can change the source version in the build
 and see what breaks. Gump we can fix directly. buildbot we may need to
 ask infra to fix (whch means I might have the karma to fix it anyway).
[Filip Hanik] 
You got it. I'll be removing the jdbc-pool externals and do a svn copy for
Tomcat 7.
That way I can refactor in trunk even for jdbc-pool. 

 
 Mark
 
 
  Sent from my iPhone
 
  On Jul 11, 2012, at 16:42, Mark Thomas ma...@apache.org wrote:
 
  On 11/07/2012 23:40, Filip Hanik (mailing lists) wrote:
  How do I get access to the build environment?
 
  Which build environment? Gump, buildbot, something else?
 
  Mark
 
 
  So we can change the build to default to Java 7
 
  Filip
 
 
 
 
  
 -
  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: dev-h...@tomcat.apache.org
 
 
 
 
  -
  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: dev-h...@tomcat.apache.org
 
 
  -
  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: dev-h...@tomcat.apache.org
 
 
 
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org



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

svn commit: r1360704 - in /tomcat/tc7.0.x/trunk/modules: ./ jdbc-pool/

[fhanik]

Author: fhanik
Date: Thu Jul 12 14:34:50 2012
New Revision: 1360704

URL: http://svn.apache.org/viewvc?rev=1360704view=rev
Log:
jdbc-pool is branched off into Tomcat 7 so that refactoring can take place in 
trunk


Added:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/
  - copied from r1360703, tomcat/trunk/modules/jdbc-pool/
Modified:
tomcat/tc7.0.x/trunk/modules/   (props changed)

Propchange: tomcat/tc7.0.x/trunk/modules/
('svn:externals' removed)



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

svn commit: r1360729 - in /tomcat/trunk: ./ modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ res/dbcp/

[fhanik]

Author: fhanik
Date: Thu Jul 12 15:38:28 2012
New Revision: 1360729

URL: http://svn.apache.org/viewvc?rev=1360729view=rev
Log:
Configure Tomcat trunk to build with Java 7.
This includes adding a patch to the Commons-DBCP code from res/dbcp


Added:
tomcat/trunk/res/dbcp/
tomcat/trunk/res/dbcp/dbcp-java-7.patch   (with props)
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/build.xml

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/ResultSet.java

tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Statement.java

Modified: tomcat/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=1360729r1=1360728r2=1360729view=diff
==
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Thu Jul 12 15:38:28 2012
@@ -57,8 +57,8 @@ base.path=/usr/share/java
 #base.path=C:/path/to/the/repository
 #base.path=/usr/local
 
-compile.source=1.6
-compile.target=1.6
+compile.source=1.7
+compile.target=1.7
 compile.debug=true
 
 base-apache.loc.1=http://www.apache.org/dist

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1360729r1=1360728r2=1360729view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 12 15:38:28 2012
@@ -2426,6 +2426,13 @@ Apache Tomcat ${version} native binaries
 exclude name=**/managed/** /
   /fileset
 /copy
+echoCopied files to ${tomcat-dbcp.home}/echo
+
+patch patchfile=${basedir}/res/dbcp/dbcp-java-7.patch 
+   dir=${tomcat-dbcp.home} 
+   ignorewhitespace=true
+   strip=0/
+
 replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
 encoding=ISO-8859-1
   replacefilter token=org.apache.commons

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java?rev=1360729r1=1360728r2=1360729view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Connection.java
 Thu Jul 12 15:38:28 2012
@@ -285,25 +285,36 @@ public class Connection implements java.
 return null;
 }
 
-// -- Java 7 
methods
-// Can't add @Override annotations since this code also has to compile with
-// Java 6 for Tomcat 7.
-
+@Override
 public void setSchema(String schema) throws SQLException {
+// TODO Auto-generated method stub
+
 }
 
+@Override
 public String getSchema() throws SQLException {
+// TODO Auto-generated method stub
 return null;
 }
 
+@Override
 public void abort(Executor executor) throws SQLException {
+// TODO Auto-generated method stub
+
 }
 
-public void setNetworkTimeout(Executor executor, int milliseconds)
-throws SQLException {
+@Override
+public void setNetworkTimeout(Executor executor, int milliseconds) throws 
SQLException {
+// TODO Auto-generated method stub
+
 }
 
+@Override
 public int getNetworkTimeout() throws SQLException {
+// TODO Auto-generated method stub
 return 0;
 }
+
+
+
 }

Modified: 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java?rev=1360729r1=1360728r2=1360729view=diff
==
--- 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
 Thu Jul 12 15:38:28 2012
@@ -78,12 +78,11 @@ public class Driver implements java.sql.
 return false;
 }
 
-// -- Java 7 
methods
-// Can't add @Override annotations since this code also has to compile with
-// Java 6 for Tomcat 7.
-
 @Override
 public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+// TODO Auto-generated method stub
 return null;
 }
+
+
 }

Modified: 

svn commit: r1360730 - /tomcat/trunk/build.xml

[fhanik]

Author: fhanik
Date: Thu Jul 12 15:41:01 2012
New Revision: 1360730

URL: http://svn.apache.org/viewvc?rev=1360730view=rev
Log:
removed debug statement

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1360730r1=1360729r2=1360730view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 12 15:41:01 2012
@@ -2426,7 +2426,6 @@ Apache Tomcat ${version} native binaries
 exclude name=**/managed/** /
   /fileset
 /copy
-echoCopied files to ${tomcat-dbcp.home}/echo
 
 patch patchfile=${basedir}/res/dbcp/dbcp-java-7.patch 
dir=${tomcat-dbcp.home} 



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

Re: svn commit: r1360618 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket: AprSocket.java AprSocketContext.java

[Mark Thomas]

On 12/07/2012 11:48, Rainer Jung wrote:
 On 12.07.2012 12:30, ma...@apache.org wrote:
 Author: markt
 Date: Thu Jul 12 10:30:44 2012
 New Revision: 1360618

 URL: http://svn.apache.org/viewvc?rev=1360618view=rev
 Log:
 Clean up debug logging

 Modified:
  tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
  tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java

 Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
 URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360618r1=1360617r2=1360618view=diff

 ==

 --- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
 (original)
 +++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu
 Jul 12 10:30:44 2012
 @@ -56,9 +56,10 @@ import org.apache.tomcat.jni.socket.AprS
*/
   public class AprSocket implements Runnable {

 -static final byte[][] NO_CERTS = new byte[0][];
 +private static final Logger log =
 +Logger.getLogger(org.apache.tomcat.jni.socket.AprSocket);

 -static Logger log = Logger.getLogger(AprSocket);
 +static final byte[][] NO_CERTS = new byte[0][];

   static int CONNECTING = 1;
   static int CONNECTED = 0x2;
 @@ -280,7 +281,7 @@ public class AprSocket implements Runnab
   updatePolling();
   return rt;
   }
 -if (context.debug) {
 +if (log.isLoggable(Level.WARNING)) {
 
 debug  warning replaced by unconditional WARNING?
 In all other cases you changed debug  info to FINE.

Since the check and the log level were inconsistent, I had to go one way
or the other. If I made the wrong choice we can always reduce the log
level later.

There is also no need for the level check here either. I'll remove it.

Cheers,

Mark

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

svn commit: r1360746 - /tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java

[markt]

Author: markt
Date: Thu Jul 12 16:19:45 2012
New Revision: 1360746

URL: http://svn.apache.org/viewvc?rev=1360746view=rev
Log:
Remove level check

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1360746r1=1360745r2=1360746view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Thu Jul 12 
16:19:45 2012
@@ -281,9 +281,7 @@ public class AprSocket implements Runnab
 updatePolling();
 return rt;
 }
-if (log.isLoggable(Level.WARNING)) {
-log.warning(apr.send(): Failed to send, closing  + sent);
-}
+log.warning(apr.send(): Failed to send, closing  + sent);
 reset();
 throw new IOException(Error sending  + sent +   + 
Error.strerror(-sent));
 } else {



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

Re: access to build environment

[Mark Thomas]

On 12/07/2012 15:28, Filip Hanik (mailing lists) wrote:
 -Original Message-
 From: Mark Thomas [mailto:ma...@apache.org]
 Sent: Thursday, July 12, 2012 1:33 AM
 To: Tomcat Developers List
 Subject: Re: access to build environment

 On 12/07/2012 02:06, Filip Hanik wrote:
 I'd guess those two, do we use anything else for tomcat ci?

 Not on ASF infrastructure.

 The first step is to get trunk building with 1.7. It doesn't at the
 moment because of some jdbc-pool tests that implement some of the SQL
 interfaces. Fix those and we can change the source version in the build
 and see what breaks. Gump we can fix directly. buildbot we may need to
 ask infra to fix (whch means I might have the karma to fix it anyway).
 [Filip Hanik] 
 You got it. I'll be removing the jdbc-pool externals and do a svn copy for
 Tomcat 7.
 That way I can refactor in trunk even for jdbc-pool. 

Sounds good to me.

I'll update the Eclipse build info and start some of the Generics
clean-up that Java 7 will allow.

Mark

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

svn commit: r1360748 - /tomcat/trunk/build.xml

[markt]

Author: markt
Date: Thu Jul 12 16:21:42 2012
New Revision: 1360748

URL: http://svn.apache.org/viewvc?rev=1360748view=rev
Log:
Whitespace police

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1360748r1=1360747r2=1360748view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Jul 12 16:21:42 2012
@@ -2426,12 +2426,12 @@ Apache Tomcat ${version} native binaries
 exclude name=**/managed/** /
   /fileset
 /copy
-
-patch patchfile=${basedir}/res/dbcp/dbcp-java-7.patch 
-   dir=${tomcat-dbcp.home} 
+
+patch patchfile=${basedir}/res/dbcp/dbcp-java-7.patch
+   dir=${tomcat-dbcp.home}
ignorewhitespace=true
strip=0/
-
+
 replace dir=${tomcat-dbcp.home}/src/java/org/apache/commons
 encoding=ISO-8859-1
   replacefilter token=org.apache.commons



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

svn commit: r1360806 - in /tomcat/trunk/java/javax/el: BeanELResolver.java ELContext.java ExpressionFactory.java ListELResolver.java MapELResolver.java ResourceBundleELResolver.java

[markt]

Author: markt
Date: Thu Jul 12 16:40:55 2012
New Revision: 1360806

URL: http://svn.apache.org/viewvc?rev=1360806view=rev
Log:
Code clean-up for javax.el
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/java/javax/el/ELContext.java
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/javax/el/ListELResolver.java
tomcat/trunk/java/javax/el/MapELResolver.java
tomcat/trunk/java/javax/el/ResourceBundleELResolver.java

Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1360806r1=1360805r2=1360806view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Thu Jul 12 16:40:55 2012
@@ -61,7 +61,7 @@ public class BeanELResolver extends ELRe
 private final boolean readOnly;
 
 private final ConcurrentCacheString, BeanProperties cache =
-new ConcurrentCacheString, BeanProperties(CACHE_SIZE);
+new ConcurrentCache(CACHE_SIZE);
 
 public BeanELResolver() {
 this.readOnly = false;
@@ -218,7 +218,7 @@ public class BeanELResolver extends ELRe
 
 public BeanProperties(Class? type) throws ELException {
 this.type = type;
-this.properties = new HashMapString, BeanProperty();
+this.properties = new HashMap();
 try {
 BeanInfo info = Introspector.getBeanInfo(this.type);
 PropertyDescriptor[] pds = info.getPropertyDescriptors();
@@ -365,8 +365,8 @@ public class BeanELResolver extends ELRe
 
 public ConcurrentCache(int size) {
 this.size = size;
-this.eden = new ConcurrentHashMapK,V(size);
-this.longterm = new WeakHashMapK,V(size);
+this.eden = new ConcurrentHashMap(size);
+this.longterm = new WeakHashMap(size);
 }
 
 public V get(K key) {

Modified: tomcat/trunk/java/javax/el/ELContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=1360806r1=1360805r2=1360806view=diff
==
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Thu Jul 12 16:40:55 2012
@@ -55,7 +55,7 @@ public abstract class ELContext {
 }
 
 if (this.map == null) {
-this.map = new HashMapClass?, Object();
+this.map = new HashMap();
 }
 
 this.map.put(key, contextObject);

Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1360806r1=1360805r2=1360806view=diff
==
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Thu Jul 12 16:40:55 2012
@@ -55,8 +55,8 @@ public abstract class ExpressionFactory 
 private static final String PROPERTY_FILE;
 
 private static final CacheValue nullTcclFactory = new CacheValue();
-private static ConcurrentMapCacheKey, CacheValue factoryCache
-= new ConcurrentHashMapCacheKey, CacheValue();
+private static final ConcurrentMapCacheKey, CacheValue factoryCache =
+new ConcurrentHashMap();
 
 static {
 if (IS_SECURITY_ENABLED) {
@@ -240,7 +240,7 @@ public abstract class ExpressionFactory 
 
 public CacheKey(ClassLoader cl) {
 hash = cl.hashCode();
-ref = new WeakReferenceClassLoader(cl);
+ref = new WeakReference(cl);
 }
 
 @Override

Modified: tomcat/trunk/java/javax/el/ListELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=1360806r1=1360805r2=1360806view=diff
==
--- tomcat/trunk/java/javax/el/ListELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ListELResolver.java Thu Jul 12 16:40:55 2012
@@ -29,7 +29,7 @@ public class ListELResolver extends ELRe
 private final boolean readOnly;
 
 private static final Class? UNMODIFIABLE =
-Collections.unmodifiableList(new ArrayListObject()).getClass();
+Collections.unmodifiableList(new ArrayList()).getClass();
 
 public ListELResolver() {
 this.readOnly = false;

Modified: tomcat/trunk/java/javax/el/MapELResolver.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/MapELResolver.java?rev=1360806r1=1360805r2=1360806view=diff
==
--- tomcat/trunk/java/javax/el/MapELResolver.java (original)
+++ tomcat/trunk/java/javax/el/MapELResolver.java Thu Jul 

svn commit: r1360811 - /tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java

[fhanik]

Author: fhanik
Date: Thu Jul 12 16:50:58 2012
New Revision: 1360811

URL: http://svn.apache.org/viewvc?rev=1360811view=rev
Log:
fix override annotation

Modified:

tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java

Modified: 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java?rev=1360811r1=1360810r2=1360811view=diff
==
--- 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/driver/Driver.java
 Thu Jul 12 16:50:58 2012
@@ -82,7 +82,6 @@ public class Driver implements java.sql.
 // Can't add @Override annotations since this code also has to compile with
 // Java 6 for Tomcat 7.
 
-@Override
 public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 return null;
 }



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

svn commit: r1360814 - in /tomcat/trunk/java/javax/servlet: ./ http/ jsp/el/ jsp/tagext/

[markt]

Author: markt
Date: Thu Jul 12 17:04:02 2012
New Revision: 1360814

URL: http://svn.apache.org/viewvc?rev=1360814view=rev
Log:
Code clean-up for javax.servlet
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
tomcat/trunk/java/javax/servlet/http/Cookie.java
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/http/HttpSessionContext.java
tomcat/trunk/java/javax/servlet/http/HttpUtils.java
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
tomcat/trunk/java/javax/servlet/jsp/el/ScopedAttributeELResolver.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagAdapter.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagData.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java

Modified: tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletSecurityElement.java?rev=1360814r1=1360813r2=1360814view=diff
==
--- tomcat/trunk/java/javax/servlet/ServletSecurityElement.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletSecurityElement.java Thu Jul 12 
17:04:02 2012
@@ -34,7 +34,7 @@ import javax.servlet.annotation.ServletS
 public class ServletSecurityElement extends HttpConstraintElement {
 
 private final MapString,HttpMethodConstraintElement methodConstraints =
-new HashMapString,HttpMethodConstraintElement();
+new HashMap();
 
 /**
  * Use default HttpConstraint.
@@ -90,8 +90,7 @@ public class ServletSecurityElement exte
 annotation.value().transportGuarantee(),
 annotation.value().rolesAllowed()));
 
-ListHttpMethodConstraintElement l =
-new ArrayListHttpMethodConstraintElement();
+ListHttpMethodConstraintElement l = new ArrayList();
 HttpMethodConstraint[] constraints = 
annotation.httpMethodConstraints();
 if (constraints != null) {
 for (int i = 0; i  constraints.length; i++) {
@@ -108,14 +107,13 @@ public class ServletSecurityElement exte
 }
 
 public CollectionHttpMethodConstraintElement getHttpMethodConstraints() {
-CollectionHttpMethodConstraintElement result =
-new HashSetHttpMethodConstraintElement();
+CollectionHttpMethodConstraintElement result = new HashSet();
 result.addAll(methodConstraints.values());
 return result;
 }
 
 public CollectionString getMethodNames() {
-CollectionString result = new HashSetString();
+CollectionString result = new HashSet();
 result.addAll(methodConstraints.keySet());
 return result;
 }

Modified: tomcat/trunk/java/javax/servlet/http/Cookie.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Cookie.java?rev=1360814r1=1360813r2=1360814view=diff
==
--- tomcat/trunk/java/javax/servlet/http/Cookie.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Cookie.java Thu Jul 12 17:04:02 2012
@@ -59,13 +59,14 @@ public class Cookie implements Cloneable
 private static final long serialVersionUID = 1L;
 
 private static final String LSTRING_FILE = 
javax.servlet.http.LocalStrings;
-private static ResourceBundle lStrings = 
ResourceBundle.getBundle(LSTRING_FILE);
+private static final ResourceBundle lStrings =
+ResourceBundle.getBundle(LSTRING_FILE);
 
 //
 // The value of the cookie itself.
 //
 
-private String name; // NAME= ... $Name style is reserved
+private final String name; // NAME= ... $Name style is reserved
 private String value; // value of NAME
 
 //

Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1360814r1=1360813r2=1360814view=diff
==
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Thu Jul 12 17:04:02 
2012
@@ -90,7 +90,7 @@ public abstract class HttpServlet extend
 
 private static final String LSTRING_FILE =
 javax.servlet.http.LocalStrings;
-private static ResourceBundle lStrings =
+private static final ResourceBundle lStrings =
 ResourceBundle.getBundle(LSTRING_FILE);
 
 
@@ -732,9 +732,9 @@ public abstract class HttpServlet extend
  */
 // file private
 class NoBodyResponse extends HttpServletResponseWrapper {
-private NoBodyOutputStreamnoBody;
-private PrintWriterwriter;
-private boolean 

svn commit: r1360821 - /tomcat/trunk/TOMCAT-NEXT.txt

[markt]

Author: markt
Date: Thu Jul 12 17:13:13 2012
New Revision: 1360821

URL: http://svn.apache.org/viewvc?rev=1360821view=rev
Log:
Update

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1360821r1=1360820r2=1360821view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Thu Jul 12 17:13:13 2012
@@ -34,6 +34,8 @@ but possibly 7.1.x).
 
  5. Run the unused code detector and remove everything that isn't currently 
used.
 Add deprecation markers for the removed code to Tomcat 7.0.x
+- Complete for javax.*
+- Remaining code in progress
 
  6. Change the default URIEncoding on the connector to UTF-8.
 



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

svn commit: r1360822 - /tomcat/trunk/TOMCAT-NEXT.txt

[markt]

Author: markt
Date: Thu Jul 12 17:15:14 2012
New Revision: 1360822

URL: http://svn.apache.org/viewvc?rev=1360822view=rev
Log:
More work

Modified:
tomcat/trunk/TOMCAT-NEXT.txt

Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1360822r1=1360821r2=1360822view=diff
==
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Thu Jul 12 17:15:14 2012
@@ -56,4 +56,13 @@ but possibly 7.1.x).
 to implementations in other packages. This is likely to require a lot of
 work. Maybe use Structure 101 (or similar) to help.
 
-11. Merge Service and Engine
\ No newline at end of file
+11. Merge Service and Engine
+
+12. Java 7 updates
+- Use of  operator where possible
+  - Complete for javax.*
+  - Not started for remainder
+- Use of try with resources
+  - Not started
+- Catching multiple exceptions
+  - Not started
\ 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: r1360838 - in /tomcat/trunk/java/org/apache/catalina/ant/jmx: Arg.java JMXAccessorCreateTask.java JMXAccessorInvokeTask.java

[markt]

Author: markt
Date: Thu Jul 12 18:07:12 2012
New Revision: 1360838

URL: http://svn.apache.org/viewvc?rev=1360838view=rev
Log:
Deprecate so they can be made private

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java?rev=1360838r1=1360837r2=1360838view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java Thu Jul 12 18:07:12 
2012
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.ant.jmx;
 
 /**
@@ -24,7 +23,15 @@ package org.apache.catalina.ant.jmx;
  * @since 5.5.10
  */
 public class Arg {
+/**
+ * @deprecated  Use getter/setter
+ */
+@Deprecated
 String type;
+/**
+ * @deprecated  Use getter/setter
+ */
+@Deprecated
 String value;
 
 public void setType( String type) {
@@ -33,6 +40,10 @@ public class Arg {
 public void setValue( String value ) {
 this.value=value;
 }
+/**
+ * @deprecated  Use {@link #setValue(String)}
+ */
+@Deprecated
 public void addText( String text ) {
 this.value=text;
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1360838r1=1360837r2=1360838view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
Thu Jul 12 18:07:12 2012
@@ -153,8 +153,8 @@ public class JMXAccessorCreateTask exten
sigA = new String[args.size()];
for( int i=0; iargs.size(); i++ ) {
Arg arg=args.get(i);
-   if( arg.type==null) {
-   arg.type=java.lang.String;
+   if (arg.getType() == null) {
+   arg.setType(java.lang.String);
sigA[i]=arg.getType();
argsA[i]=arg.getValue();
} else {

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=1360838r1=1360837r2=1360838view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java 
Thu Jul 12 18:07:12 2012
@@ -169,8 +169,8 @@ public class JMXAccessorInvokeTask exten
 String sigA[]=new String[args.size()];
 for( int i=0; iargs.size(); i++ ) {
 Arg arg=args.get(i);
-if( arg.type==null) {
-arg.type=java.lang.String;
+if (arg.getType() == null) {
+arg.setType(java.lang.String);
 sigA[i]=arg.getType();
 argsA[i]=arg.getValue();
 } else {



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

svn commit: r1360839 - in /tomcat/trunk/java/org/apache/catalina/ant/jmx: Arg.java JMXAccessorCreateTask.java JMXAccessorInvokeTask.java JMXAccessorTask.java

[markt]

Author: markt
Date: Thu Jul 12 18:10:32 2012
New Revision: 1360839

URL: http://svn.apache.org/viewvc?rev=1360839view=rev
Log:
Code clean-up for o.a.catalina.ant.jmx
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java?rev=1360839r1=1360838r2=1360839view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/Arg.java Thu Jul 12 18:10:32 
2012
@@ -23,30 +23,17 @@ package org.apache.catalina.ant.jmx;
  * @since 5.5.10
  */
 public class Arg {
-/**
- * @deprecated  Use getter/setter
- */
-@Deprecated
-String type;
-/**
- * @deprecated  Use getter/setter
- */
-@Deprecated
-String value;
+
+private String type;
+private String value;
 
 public void setType( String type) {
 this.type=type;
 }
+
 public void setValue( String value ) {
 this.value=value;
 }
-/**
- * @deprecated  Use {@link #setValue(String)}
- */
-@Deprecated
-public void addText( String text ) {
-this.value=text;
-}
 
 public String getValue() {
 return value;

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1360839r1=1360838r2=1360839view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java 
Thu Jul 12 18:10:32 2012
@@ -63,7 +63,7 @@ public class JMXAccessorCreateTask exten
 
 private String className;
 private String classLoader;
-private ListArg args=new ArrayListArg();
+private ListArg args=new ArrayList();
 
 // - Properties
 

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=1360839r1=1360838r2=1360839view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java 
Thu Jul 12 18:10:32 2012
@@ -97,7 +97,7 @@ public class JMXAccessorInvokeTask exten
 // - Instance Variables
 
 private String operation ;
-private ListArg args=new ArrayListArg();
+private ListArg args=new ArrayList();
 
 // - Properties
 

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1360839r1=1360838r2=1360839view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Thu Jul 
12 18:10:32 2012
@@ -123,7 +123,7 @@ public class JMXAccessorTask extends Bas
 
 private String ifCondition;
 
-private Properties properties = new Properties();
+private final Properties properties = new Properties();
 
 // - Properties
 
@@ -362,7 +362,7 @@ public class JMXAccessorTask extends Bas
 String[] credentials = new String[2];
 credentials[0] = username;
 credentials[1] = password;
-environment = new HashMapString, String[]();
+environment = new HashMap();
 environment.put(JMXConnector.CREDENTIALS, credentials);
 }
 return JMXConnectorFactory.connect(new JMXServiceURL(urlForJMX),



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

svn commit: r1360840 - in /tomcat/trunk/java/org/apache/catalina/ant: AbstractCatalinaTask.java BaseRedirectorHelperTask.java

[markt]

Author: markt
Date: Thu Jul 12 18:12:36 2012
New Revision: 1360840

URL: http://svn.apache.org/viewvc?rev=1360840view=rev
Log:
Code clean-up for o.a.catalina.ant
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java

Modified: tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java?rev=1360840r1=1360839r2=1360840view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/AbstractCatalinaTask.java Thu Jul 
12 18:12:36 2012
@@ -52,7 +52,7 @@ public abstract class AbstractCatalinaTa
 /**
  * manager webapp's encoding.
  */
-private static String CHARSET = utf-8;
+private static final String CHARSET = utf-8;
 
 
 // - Properties

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java?rev=1360840r1=1360839r2=1360840view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/BaseRedirectorHelperTask.java Thu 
Jul 12 18:12:36 2012
@@ -56,7 +56,7 @@ public abstract class BaseRedirectorHelp
 // - Properties
 
 /** Redirector helper */
-protected Redirector redirector = new Redirector(this);
+protected final Redirector redirector = new Redirector(this);
 //protected Redirector redirector = null;
 /** Redirector element for this task */
 protected RedirectorElement redirectorElement = null;



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

svn commit: r1360841 - in /tomcat/trunk/java/org/apache/catalina/authenticator: SavedRequest.java SingleSignOn.java

[markt]

Author: markt
Date: Thu Jul 12 18:14:58 2012
New Revision: 1360841

URL: http://svn.apache.org/viewvc?rev=1360841view=rev
Log:
Code clean-up for o.a.catalina.authenticator
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java?rev=1360841r1=1360840r2=1360841view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java Thu 
Jul 12 18:14:58 2012
@@ -48,7 +48,7 @@ public final class SavedRequest {
 /**
  * The set of Cookies associated with this Request.
  */
-private ArrayListCookie cookies = new ArrayListCookie();
+private final ArrayListCookie cookies = new ArrayList();
 
 public void addCookie(Cookie cookie) {
 cookies.add(cookie);
@@ -65,13 +65,12 @@ public final class SavedRequest {
  * values for this header.  The values are returned as an Iterator when
  * you ask for them.
  */
-private HashMapString,ArrayListString headers =
-new HashMapString,ArrayListString();
+private final HashMapString,ArrayListString headers = new HashMap();
 
 public void addHeader(String name, String value) {
 ArrayListString values = headers.get(name);
 if (values == null) {
-values = new ArrayListString();
+values = new ArrayList();
 headers.put(name, values);
 }
 values.add(value);
@@ -93,7 +92,7 @@ public final class SavedRequest {
 /**
  * The set of Locales associated with this Request.
  */
-private ArrayListLocale locales = new ArrayListLocale();
+private final ArrayListLocale locales = new ArrayList();
 
 public void addLocale(Locale locale) {
 locales.add(locale);

Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1360841r1=1360840r2=1360841view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Thu 
Jul 12 18:14:58 2012
@@ -71,8 +71,7 @@ public class SingleSignOn extends ValveB
  * The cache of SingleSignOnEntry instances for authenticated Principals,
  * keyed by the cookie value that is used to select them.
  */
-protected MapString,SingleSignOnEntry cache =
-new HashMapString,SingleSignOnEntry();
+protected final MapString,SingleSignOnEntry cache = new HashMap();
 
 
 /**
@@ -86,7 +85,7 @@ public class SingleSignOn extends ValveB
  * The cache of single sign on identifiers, keyed by the Session that is
  * associated with them.
  */
-protected MapSession,String reverse = new HashMapSession,String();
+protected final MapSession,String reverse = new HashMap();
 
 
 /**



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

[Bug 53541] New: Bug in virtual webapp feature. Custom tags badly supported.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53541

  Priority: P2
Bug ID: 53541
  Assignee: dev@tomcat.apache.org
   Summary: Bug in virtual webapp feature. Custom tags badly
supported.
  Severity: major
Classification: Unclassified
  Reporter: philipz...@gmail.com
  Hardware: PC
Status: NEW
   Version: 7.0.28
 Component: Catalina
   Product: Tomcat 7

Defect report - briefly:
Tomcat implements “virtual webapp” feature. For details, see
http://tomcat.apache.org/tomcat-7.0-doc/config/context.html#Virtual_webapp
Tomcat 7.0.28 implementation of “virtual webapp” has a defect – it does not
allow developer to use tag library from WEB-INF/lib/*.jar. For example,
developer can’t put well known jstl-1.2.jar into WEB-INF/lib/ and use it.

Defect report – detailed:
Proof of concept web application -
lite-filter-mdot-1.0.0-BUILD-SNAPSHOT-sources.jar. Really, it’s a sample web
app downloaded from Spring Source.  You can download it from
https://github.com/SpringSource/spring-mobile-samples. I just changed POM a
little bit to remove redundant samples.

Error screenshot – error.png

Zipped tomcat CONF directory – defect-conf.zip
==From Spring.xml
Context path=/spring
docBase=C:/Users/Filipp_Zuev/workspace/lite-filter-mdot/src/main/webapp 
  Resources className=org.apache.naming.resources.VirtualDirContext
extraResourcePaths=
 
/WEB-INF/classes=C:/Users/Filipp_Zuev/workspace/lite-filter-mdot/target/classes,/WEB-INF/lib=C:/Users/Filipp_Zuev/workspace/lite-filter-mdot/target/lite-filter-mdot-1.0.0-BUILD-SNAPSHOT/WEB-INF/lib
/
  Loader className=org.apache.catalina.loader.VirtualWebappLoader
   
virtualClasspath=C:/Users/Filipp_Zuev/workspace/lite-filter-mdot/target/classes;
 
C:/Users/Filipp_Zuev/workspace/lite-filter-mdot/target/lite-filter-mdot-1.0.0-BUILD-SNAPSHOT/WEB-INF/lib/*.jar
/
  JarScanner scanAllDirectories=true /
/Context
=
Tomcat log file - catalina.2012-07-12.log

Defect–fix suggested:
Add this method to org.apache.naming.resources.VirtualDirContext
@Override
protected String doGetRealPath(String path) {
File file = file(path);
if(null!=file){
return file.getAbsolutePath();
}else{
return null;
}
}

Defect–fix suggested-proof of concept:
1.Deploy attached tomcat-extension-0.0.1-SNAPSHOT.jar with
me.tomcat.bugfix.workaround.VirtualDirContext.class into Tomcat’s common lib
directory.
2.In the Context configuration for the proof of concept application replace
org.apache.naming.resources.VirtualDirContext for
me.tomcat.bugfix.workaround.VirtualDirContext
3.Restart tomcat. 
Defect 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 53541] Bug in virtual webapp feature. Custom tags badly supported.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53541

Philip philipz...@gmail.com changed:

   What|Removed |Added

 CC||philipz...@gmail.com
 OS||All

-- 
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 53541] Bug in virtual webapp feature. Custom tags badly supported.

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53541

--- Comment #1 from Philip philipz...@gmail.com ---
All configs, sources, logs mentioned in the defect report, can be downloaded
here - https://docs.google.com/open?id=0B1YRF9AZ53VhSlJaRkY5dS1aZW8

P.S.
Bugzilla limited me to 1kb per attachement, it's very unuseful.

-- 
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: r1360847 - /tomcat/trunk/java/org/apache/catalina/connector/Response.java

[markt]

Author: markt
Date: Thu Jul 12 18:30:32 2012
New Revision: 1360847

URL: http://svn.apache.org/viewvc?rev=1360847view=rev
Log:
Deprecate unused protected field

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1360847r1=1360846r2=1360847view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Jul 12 
18:30:32 2012
@@ -117,6 +117,7 @@ public class Response
 
 /**
  * Associated Catalina connector.
+ * @deprecated  Unused
  */
 protected Connector connector;
 



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

[Bug 53541] Bug in virtual webapp feature. Custom tags badly supported. Error is org.apache.jasper.JasperException: The absolute uri: http://java.sun.com/jsp/jstl/core cannot be resolved in either we

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53541

Philip philipz...@gmail.com changed:

   What|Removed |Added

Summary|Bug in virtual webapp   |Bug in virtual webapp
   |feature. Custom tags badly  |feature. Custom tags badly
   |supported.  |supported. Error is
   ||org.apache.jasper.JasperEx
   ||ception: The absolute uri:
   ||http://java.sun.com/jsp/jst
   ||l/core cannot be resolved
   ||in either web.xml or the
   ||jar files deployed with
   ||this application

-- 
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 53541] Bug in virtual webapp feature. Custom tags badly supported. Error is org.apache.jasper.JasperException: The absolute uri: http://java.sun.com/jsp/jstl/core cannot be resolved in either we

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53541

Philip philipz...@gmail.com changed:

   What|Removed |Added

URL||https://docs.google.com/ope
   ||n?id=0B1YRF9AZ53VhSlJaRkY5d
   ||S1aZW8

-- 
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: r1360850 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/jmx/Arg.java java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java java/org/apache/catalina/ant/jmx/JMXAccessorIn

[markt]

Author: markt
Date: Thu Jul 12 18:35:57 2012
New Revision: 1360850

URL: http://svn.apache.org/viewvc?rev=1360850view=rev
Log:
Deprecate so they can be made private in 8.0.x

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java

tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java

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

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java?rev=1360850r1=1360849r2=1360850view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/Arg.java Thu Jul 12 
18:35:57 2012
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.catalina.ant.jmx;
 
 /**
@@ -24,7 +23,15 @@ package org.apache.catalina.ant.jmx;
  * @since 5.5.10
  */
 public class Arg {
+/**
+ * @deprecated  Use getter/setter
+ */
+@Deprecated
 String type;
+/**
+ * @deprecated  Use getter/setter
+ */
+@Deprecated
 String value;
 
 public void setType( String type) {
@@ -33,6 +40,10 @@ public class Arg {
 public void setValue( String value ) {
 this.value=value;
 }
+/**
+ * @deprecated  Use {@link #setValue(String)}
+ */
+@Deprecated
 public void addText( String text ) {
 this.value=text;
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java?rev=1360850r1=1360849r2=1360850view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCreateTask.java
 Thu Jul 12 18:35:57 2012
@@ -173,8 +173,8 @@ public class JMXAccessorCreateTask exten
sigA = new String[args.size()];
for( int i=0; iargs.size(); i++ ) {
Arg arg=args.get(i);
-   if( arg.type==null) {
-   arg.type=java.lang.String;
+   if (arg.getType() == null) {
+   arg.setType(java.lang.String);
sigA[i]=arg.getType();
argsA[i]=arg.getValue();
} else {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java?rev=1360850r1=1360849r2=1360850view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorInvokeTask.java
 Thu Jul 12 18:35:57 2012
@@ -188,8 +188,8 @@ public class JMXAccessorInvokeTask exten
 String sigA[]=new String[args.size()];
 for( int i=0; iargs.size(); i++ ) {
 Arg arg=args.get(i);
-if( arg.type==null) {
-arg.type=java.lang.String;
+if (arg.getType() == null) {
+arg.setType(java.lang.String);
 sigA[i]=arg.getType();
 argsA[i]=arg.getValue();
 } else {



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

svn commit: r1360851 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/connector/Response.java

[markt]

Author: markt
Date: Thu Jul 12 18:37:11 2012
New Revision: 1360851

URL: http://svn.apache.org/viewvc?rev=1360851view=rev
Log:
Deprecate unused code

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java

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

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java?rev=1360851r1=1360850r2=1360851view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Response.java Thu 
Jul 12 18:37:11 2012
@@ -126,6 +126,7 @@ public class Response
 
 /**
  * Associated Catalina connector.
+ * @deprecated  Unused
  */
 protected Connector connector;
 



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

svn commit: r1360853 - /tomcat/trunk/java/org/apache/catalina/connector/Response.java

[markt]

Author: markt
Date: Thu Jul 12 18:37:43 2012
New Revision: 1360853

URL: http://svn.apache.org/viewvc?rev=1360853view=rev
Log:
Remove unused code

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1360853r1=1360852r2=1360853view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Thu Jul 12 
18:37:43 2012
@@ -114,21 +114,12 @@ public class Response
 
 // - Properties
 
-
-/**
- * Associated Catalina connector.
- * @deprecated  Unused
- */
-protected Connector connector;
-
-
 /**
  * Set the Connector through which this Request was received.
  *
  * @param connector The new connector
  */
 public void setConnector(Connector connector) {
-this.connector = connector;
 if(AJP/1.3.equals(connector.getProtocol())) {
 // default size to size of one ajp-packet
 outputBuffer = new OutputBuffer(8184);



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

svn commit: r1360855 - in /tomcat/trunk/java/org/apache/catalina/connector: Connector.java CoyoteAdapter.java CoyotePrincipal.java InputBuffer.java MapperListener.java OutputBuffer.java Request.java R

[markt]

Author: markt
Date: Thu Jul 12 18:42:57 2012
New Revision: 1360855

URL: http://svn.apache.org/viewvc?rev=1360855view=rev
Log:
Code clean-up for o.a.catalina.connector
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/MapperListener.java
tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1360855r1=1360854r2=1360855view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Thu Jul 12 
18:42:57 2012
@@ -67,12 +67,15 @@ public class Connector extends Lifecycle
 public Connector(String protocol) {
 setProtocol(protocol);
 // Instantiate protocol handler
+ProtocolHandler p = null;
 try {
 Class? clazz = Class.forName(protocolHandlerClassName);
-this.protocolHandler = (ProtocolHandler) clazz.newInstance();
+p = (ProtocolHandler) clazz.newInstance();
 } catch (Exception e) {
 log.error(sm.getString(
 coyoteConnector.protocolHandlerInstantiationFailed), e);
+} finally {
+this.protocolHandler = p;
 }
 }
 
@@ -210,7 +213,7 @@ public class Connector extends Lifecycle
 /**
  * Coyote protocol handler.
  */
-protected ProtocolHandler protocolHandler = null;
+protected final ProtocolHandler protocolHandler;
 
 
 /**
@@ -222,13 +225,14 @@ public class Connector extends Lifecycle
  /**
   * Mapper.
   */
- protected Mapper mapper = new Mapper();
+ protected final Mapper mapper = new Mapper();
 
 
  /**
   * Mapper listener.
   */
- protected MapperListener mapperListener = new MapperListener(mapper, 
this);
+ protected final MapperListener mapperListener =
+ new MapperListener(mapper, this);
 
 
  /**
@@ -243,8 +247,8 @@ public class Connector extends Lifecycle
  protected boolean useBodyEncodingForURI = false;
 
 
- protected static HashMapString,String replacements =
- new HashMapString,String();
+ protected static final HashMapString,String replacements =
+ new HashMap();
  static {
  replacements.put(acceptCount, backlog);
  replacements.put(connectionLinger, soLinger);
@@ -490,7 +494,7 @@ public class Connector extends Lifecycle
 
 public void setParseBodyMethods(String methods) {
 
-HashSetString methodSet = new HashSetString();
+HashSetString methodSet = new HashSet();
 
 if( null != methods ) {
 methodSet.addAll(Arrays.asList(methods.split(\\s*,\\s*)));

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1360855r1=1360854r2=1360855view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Thu Jul 
12 18:42:57 2012
@@ -100,7 +100,7 @@ public class CoyoteAdapter implements Ad
 /**
  * The CoyoteConnector with which this processor is associated.
  */
-private Connector connector = null;
+private final Connector connector;
 
 
 /**
@@ -113,7 +113,7 @@ public class CoyoteAdapter implements Ad
 /**
  * Encoder for the Location URL in HTTP redirects.
  */
-protected static URLEncoder urlEncoder;
+protected static final URLEncoder urlEncoder;
 
 
 // - Static Initializer

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java?rev=1360855r1=1360854r2=1360855view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java Thu 
Jul 12 18:42:57 2012
@@ -47,7 +47,7 @@ public class CoyotePrincipal implements 
 /**
  * The username of the user represented by this 

svn commit: r1360892 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java

[markt]

Author: markt
Date: Thu Jul 12 19:50:56 2012
New Revision: 1360892

URL: http://svn.apache.org/viewvc?rev=1360892view=rev
Log:
Deprecate

Modified:

tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java

Modified: 
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1360892r1=1360891r2=1360892view=diff
==
--- 
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 Thu Jul 12 19:50:56 2012
@@ -28,6 +28,10 @@ import org.apache.catalina.deploy.JspPro
 public class ApplicationJspPropertyGroupDescriptor
 implements JspPropertyGroupDescriptor{
 
+/**
+ * @deprecated  Will be made private in 8.0.x
+ */
+@Deprecated
 JspPropertyGroup jspPropertyGroup;
 
 



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

svn commit: r1360894 - /tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java

[markt]

Author: markt
Date: Thu Jul 12 19:58:38 2012
New Revision: 1360894

URL: http://svn.apache.org/viewvc?rev=1360894view=rev
Log:
Fix Java 7 warnings

Modified:
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java

Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1360894r1=1360893r2=1360894view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Jul 12 
19:58:38 2012
@@ -64,7 +64,7 @@ public class AsyncContextImpl implements
 
 private ServletRequest servletRequest = null;
 private ServletResponse servletResponse = null;
-private final ListAsyncListenerWrapper listeners = new 
ArrayListAsyncListenerWrapper();
+private final ListAsyncListenerWrapper listeners = new ArrayList();
 private boolean hasOriginalRequestAndResponse = true;
 private volatile Runnable dispatch = null;
 private Context context = null;
@@ -92,8 +92,7 @@ public class AsyncContextImpl implements
 
 @Override
 public void fireOnComplete() {
-ListAsyncListenerWrapper listenersCopy =
-new ArrayListAsyncListenerWrapper();
+ListAsyncListenerWrapper listenersCopy = new ArrayList();
 listenersCopy.addAll(listeners);
 for (AsyncListenerWrapper listener : listenersCopy) {
 try {
@@ -172,8 +171,7 @@ public class AsyncContextImpl implements
 try {
 Thread.currentThread().setContextClassLoader(newCL);
 boolean listenerInvoked = false;
-ListAsyncListenerWrapper listenersCopy =
-new ArrayListAsyncListenerWrapper();
+ListAsyncListenerWrapper listenersCopy = new ArrayList();
 listenersCopy.addAll(listeners);
 for (AsyncListenerWrapper listener : listenersCopy) {
 listener.fireOnTimeout(event);
@@ -289,7 +287,6 @@ public class AsyncContextImpl implements
 listeners.add(wrapper);
 }
 
-@SuppressWarnings(unchecked)
 @Override
 public T extends AsyncListener T createListener(ClassT clazz)
 throws ServletException {
@@ -353,8 +350,7 @@ public class AsyncContextImpl implements
 this.hasOriginalRequestAndResponse = originalRequestResponse;
 this.event = new AsyncEvent(this, request, response);
 
-ListAsyncListenerWrapper listenersCopy =
-new ArrayListAsyncListenerWrapper();
+ListAsyncListenerWrapper listenersCopy = new ArrayList();
 listenersCopy.addAll(listeners);
 for (AsyncListenerWrapper listener : listenersCopy) {
 try {
@@ -416,8 +412,7 @@ public class AsyncContextImpl implements
 request.getCoyoteRequest().action(ActionCode.ASYNC_ERROR, null);
 AsyncEvent errorEvent = new AsyncEvent(event.getAsyncContext(),
 event.getSuppliedRequest(), event.getSuppliedResponse(), t);
-ListAsyncListenerWrapper listenersCopy =
-new ArrayListAsyncListenerWrapper();
+ListAsyncListenerWrapper listenersCopy = new ArrayList();
 listenersCopy.addAll(listeners);
 for (AsyncListenerWrapper listener : listenersCopy) {
 try {



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

svn commit: r1360905 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

[fhanik]

Author: fhanik
Date: Thu Jul 12 20:11:31 2012
New Revision: 1360905

URL: http://svn.apache.org/viewvc?rev=1360905view=rev
Log:
Correct handling of timeout - negative or zero means no timeout but an instant


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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1360905r1=1360904r2=1360905view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Jul 
12 20:11:31 2012
@@ -196,7 +196,11 @@ public class NioSelectorPool {
 //register OP_WRITE to the selector
 if (key==null) key = 
socket.getIOChannel().register(selector, SelectionKey.OP_WRITE);
 else key.interestOps(SelectionKey.OP_WRITE);
-keycount = selector.select(writeTimeout);
+if (writeTimeout=0) {
+keycount = selector.selectNow();
+} else {
+keycount = selector.select(writeTimeout);
+}
 }
 if (writeTimeout  0  (selector == null || keycount == 0) ) 
timedout = (System.currentTimeMillis()-time)=writeTimeout;
 }//while
@@ -264,7 +268,11 @@ public class NioSelectorPool {
 //register OP_WRITE to the selector
 if (key==null) key = 
socket.getIOChannel().register(selector, SelectionKey.OP_READ);
 else key.interestOps(SelectionKey.OP_READ);
-keycount = selector.select(readTimeout);
+if (readTimeout=0) {
+keycount = selector.selectNow();
+} else {
+keycount = selector.select(readTimeout);
+}
 }
 if (readTimeout  0  (selector == null || keycount == 0) ) 
timedout = (System.currentTimeMillis()-time)=readTimeout;
 }//while



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

Re: svn commit: r1360905 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

[Mark Thomas]

On 12/07/2012 21:11, fha...@apache.org wrote:
 Author: fhanik
 Date: Thu Jul 12 20:11:31 2012
 New Revision: 1360905
 
 URL: http://svn.apache.org/viewvc?rev=1360905view=rev
 Log:
 Correct handling of timeout - negative or zero means no timeout but an instant

Nope. The expected and documented behaviour for a negative timeout for
all connectors is an infinite timeout.

Mark

 
 
 Modified:
 tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 
 Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1360905r1=1360904r2=1360905view=diff
 ==
 --- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java 
 (original)
 +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Jul 
 12 20:11:31 2012
 @@ -196,7 +196,11 @@ public class NioSelectorPool {
  //register OP_WRITE to the selector
  if (key==null) key = 
 socket.getIOChannel().register(selector, SelectionKey.OP_WRITE);
  else key.interestOps(SelectionKey.OP_WRITE);
 -keycount = selector.select(writeTimeout);
 +if (writeTimeout=0) {
 +keycount = selector.selectNow();
 +} else {
 +keycount = selector.select(writeTimeout);
 +}
  }
  if (writeTimeout  0  (selector == null || keycount == 0) 
 ) timedout = (System.currentTimeMillis()-time)=writeTimeout;
  }//while
 @@ -264,7 +268,11 @@ public class NioSelectorPool {
  //register OP_WRITE to the selector
  if (key==null) key = 
 socket.getIOChannel().register(selector, SelectionKey.OP_READ);
  else key.interestOps(SelectionKey.OP_READ);
 -keycount = selector.select(readTimeout);
 +if (readTimeout=0) {
 +keycount = selector.selectNow();
 +} else {
 +keycount = selector.select(readTimeout);
 +}
  }
  if (readTimeout  0  (selector == null || keycount == 0) ) 
 timedout = (System.currentTimeMillis()-time)=readTimeout;
  }//while
 
 
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org
 



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

svn commit: r1360910 - /tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

[markt]

Author: markt
Date: Thu Jul 12 20:26:48 2012
New Revision: 1360910

URL: http://svn.apache.org/viewvc?rev=1360910view=rev
Log:
Code clean-up
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1360910r1=1360909r2=1360910view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Thu Jul 12 
20:26:48 2012
@@ -138,10 +138,9 @@ public abstract class ContainerBase exte
  * this allows the XML parser to have fewer privileges than
  * Tomcat.
  */
-protected class PrivilegedAddChild
-implements PrivilegedActionVoid {
+protected class PrivilegedAddChild implements PrivilegedActionVoid {
 
-private Container child;
+private final Container child;
 
 PrivilegedAddChild(Container child) {
 this.child = child;
@@ -162,8 +161,7 @@ public abstract class ContainerBase exte
 /**
  * The child Containers belonging to this Container, keyed by name.
  */
-protected HashMapString, Container children =
-new HashMapString, Container();
+protected final HashMapString, Container children = new HashMap();
 
 
 /**
@@ -178,8 +176,7 @@ public abstract class ContainerBase exte
  * themselves or other listeners and with a ReadWriteLock that would 
trigger
  * a deadlock.
  */
-protected ListContainerListener listeners =
-new CopyOnWriteArrayListContainerListener();
+protected final ListContainerListener listeners = new 
CopyOnWriteArrayList();
 
 /**
  * The Logger implementation with which this Container is associated.
@@ -220,7 +217,7 @@ public abstract class ContainerBase exte
 /**
  * The Pipeline object with which this Container is associated.
  */
-protected Pipeline pipeline = new StandardPipeline(this);
+protected final Pipeline pipeline = new StandardPipeline(this);
 
 
 /**
@@ -250,7 +247,8 @@ public abstract class ContainerBase exte
 /**
  * The property change support for this component.
  */
-protected PropertyChangeSupport support = new PropertyChangeSupport(this);
+protected final PropertyChangeSupport support =
+new PropertyChangeSupport(this);
 
 
 /**
@@ -846,8 +844,7 @@ public abstract class ContainerBase exte
 
 @Override
 protected void initInternal() throws LifecycleException {
-BlockingQueueRunnable startStopQueue =
-new LinkedBlockingQueueRunnable();
+BlockingQueueRunnable startStopQueue = new LinkedBlockingQueue();
 startStopExecutor = new ThreadPoolExecutor(
 getStartStopThreadsInternal(),
 getStartStopThreadsInternal(), 10, TimeUnit.SECONDS,
@@ -879,7 +876,7 @@ public abstract class ContainerBase exte
 
 // Start our child containers, if any
 Container children[] = findChildren();
-ListFutureVoid results = new ArrayListFutureVoid();
+ListFutureVoid results = new ArrayList();
 for (int i = 0; i  children.length; i++) {
 results.add(startStopExecutor.submit(new StartChild(children[i])));
 }
@@ -935,7 +932,7 @@ public abstract class ContainerBase exte
 
 // Stop our child containers, if any
 Container children[] = findChildren();
-ListFutureVoid results = new ArrayListFutureVoid();
+ListFutureVoid results = new ArrayList();
 for (int i = 0; i  children.length; i++) {
 results.add(startStopExecutor.submit(new StopChild(children[i])));
 }



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

svn commit: r1360917 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

[fhanik]

Author: fhanik
Date: Thu Jul 12 20:40:02 2012
New Revision: 1360917

URL: http://svn.apache.org/viewvc?rev=1360917view=rev
Log:
Fix timeout according to Javadoc

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1360917r1=1360916r2=1360917view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Jul 
12 20:40:02 2012
@@ -196,8 +196,10 @@ public class NioSelectorPool {
 //register OP_WRITE to the selector
 if (key==null) key = 
socket.getIOChannel().register(selector, SelectionKey.OP_WRITE);
 else key.interestOps(SelectionKey.OP_WRITE);
-if (writeTimeout=0) {
-keycount = selector.selectNow();
+if (writeTimeout==0) {
+timedout = buf.hasRemaining();
+} else if (writeTimeout0) {
+selector.select();
 } else {
 keycount = selector.select(writeTimeout);
 }
@@ -268,8 +270,10 @@ public class NioSelectorPool {
 //register OP_WRITE to the selector
 if (key==null) key = 
socket.getIOChannel().register(selector, SelectionKey.OP_READ);
 else key.interestOps(SelectionKey.OP_READ);
-if (readTimeout=0) {
-keycount = selector.selectNow();
+if (readTimeout==0) {
+timedout = (read==0);
+} else if (readTimeout0) {
+selector.select();
 } else {
 keycount = selector.select(readTimeout);
 }



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

RE: svn commit: r1360905 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

[Filip Hanik (mailing lists)]

You are correct, I was chasing down the following:

Testsuite: org.apache.catalina.websocket.TestWebSocket
Tests run: 6, Failures: 1, Errors: 0, Time elapsed: 2.048 sec

INFO: Starting ProtocolHandler [http-nio-127.0.0.1-auto-2-9027]
Jul 12, 2012 11:56:27 AM 
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler process
SEVERE: null
java.lang.IllegalArgumentException: Negative timeout
at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
at 
org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267)
at 
org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227)
at 
org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeNioProcessor.java:139)
at 
org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProcessor.java:112)
at org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:213)
at 
org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java:68)
at 
org.apache.catalina.websocket.StreamInbound.onData(StreamInbound.java:117)
at 
org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(UpgradeProcessor.java:83)
at 
org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:583)
at 
org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223)
at 
org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1676)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
at java.lang.Thread.run(Thread.java:722)

We should not use -1 in our unit tests. I'm tempted to get rid of the -1 notion 
all together, no sane person should ever use no timeout :)



 -Original Message-
 From: Mark Thomas [mailto:ma...@apache.org]
 Sent: Thursday, July 12, 2012 2:20 PM
 To: Tomcat Developers List
 Subject: Re: svn commit: r1360905 -
 /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 
 On 12/07/2012 21:11, fha...@apache.org wrote:
  Author: fhanik
  Date: Thu Jul 12 20:11:31 2012
  New Revision: 1360905
 
  URL: http://svn.apache.org/viewvc?rev=1360905view=rev
  Log:
  Correct handling of timeout - negative or zero means no timeout but an
 instant
 
 Nope. The expected and documented behaviour for a negative timeout for
 all connectors is an infinite timeout.
 
 Mark
 
 
 
  Modified:
  tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 
  Modified:
 tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
  URL:
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/ne
 t/NioSelectorPool.java?rev=1360905r1=1360904r2=1360905view=diff
 
 
 ==
  --- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 (original)
  +++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
 Thu Jul 12 20:11:31 2012
  @@ -196,7 +196,11 @@ public class NioSelectorPool {
   //register OP_WRITE to the selector
   if (key==null) key =
 socket.getIOChannel().register(selector, SelectionKey.OP_WRITE);
   else key.interestOps(SelectionKey.OP_WRITE);
  -keycount = selector.select(writeTimeout);
  +if (writeTimeout=0) {
  +keycount = selector.selectNow();
  +} else {
  +keycount = selector.select(writeTimeout);
  +}
   }
   if (writeTimeout  0  (selector == null || keycount
 == 0) ) timedout = (System.currentTimeMillis()-time)=writeTimeout;
   }//while
  @@ -264,7 +268,11 @@ public class NioSelectorPool {
   //register OP_WRITE to the selector
   if (key==null) key =
 socket.getIOChannel().register(selector, SelectionKey.OP_READ);
   else key.interestOps(SelectionKey.OP_READ);
  -keycount = selector.select(readTimeout);
  +if (readTimeout=0) {
  +keycount = selector.selectNow();
  +} else {
  +keycount = selector.select(readTimeout);
  +}
   }
   if (readTimeout  0  (selector == null || keycount
 == 0) ) timedout = (System.currentTimeMillis()-time)=readTimeout;
   }//while
 
 
 
  -
  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: dev-h...@tomcat.apache.org
 
 
 
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional 

RE: Current unit test behaviour for trunk using Java 7 on Solaris

[Filip Hanik (mailing lists)]

Fixed in 
http://svn.apache.org/viewvc?view=revisionrevision=1360917

DBCP should compile as well as JDBC-POOL with 1.7 now too

 -Original Message-
 From: Rainer Jung [mailto:rainer.j...@kippdata.de]
 Sent: Thursday, July 12, 2012 6:33 AM
 To: Tomcat Developers List
 Subject: Current unit test behaviour for trunk using Java 7 on Solaris
 
 Versions
 
 
 TC trunk r1360616 tested with Java 1.7.0_05 on Solaris 10 Sparc.
 
 Compiled everything with the same JVM version using
 
 compile.source=1.7
 compile.target=1.7
 
 except for DBCP which was compiled with Java 6.
 
 Unit test failures
 ==
 
 One test failure, namely org.apache.catalina.websocket.TestWebSocket for
 NIO:
 
 Testcase: testKey took 4.628 sec
 Testcase: testBug53339 took 0.262 sec
 Testcase: testSimple took 0.585 sec
  FAILED
 
 junit.framework.AssertionFailedError:
  at
 org.apache.catalina.websocket.TestWebSocket$WebSocketClient.readMessage(
 TestWebSocket.java:419)
  at
 org.apache.catalina.websocket.TestWebSocket$WebSocketClient.access$300(T
 estWebSocket.java:343)
  at
 org.apache.catalina.websocket.TestWebSocket.testSimple(TestWebSocket.jav
 a:99)
 
 Testcase: testNoConnection took 0.555 sec
 Testcase: testNoUpgrade took 0.425 sec
 Testcase: testDetectWrongVersion took 0.377 sec
 
 possibly due to the following exception which is not happening for BIO
 and APR (negative Timeout):
 
  [junit] 12-Jul-2012 13:19:24.329 INFO [main]
 org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler
 [http-nio-127.0.0.1-auto-2-48250]
  [junit] 12-Jul-2012 13:19:24.330 SEVERE
 [http-nio-127.0.0.1-auto-2-exec-1]
 org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process
 null
  [junit]  java.lang.IllegalArgumentException: Negative timeout
  [junit] at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
  [junit] at
 org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267
 )
  [junit] at
 org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227
 )
  [junit] at
 org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeN
 ioProcessor.java:139)
  [junit] at
 org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProc
 essor.java:112)
  [junit] at
 org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:213)
  [junit] at
 org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java
 :68)
  [junit] at
 org.apache.catalina.websocket.StreamInbound.onData(StreamInbound.java:11
 7)
  [junit] at
 org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(Upgrad
 eProcessor.java:83)
  [junit] at
 org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(Abs
 tractProtocol.java:583)
  [junit] at
 org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.proce
 ss(Http11NioProtocol.java:223)
  [junit] at
 org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.j
 ava:1676)
  [junit] at
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.jav
 a:1110)
  [junit] at
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.ja
 va:603)
  [junit] at java.lang.Thread.run(Thread.java:722)
  [junit]
  [junit] 12-Jul-2012 13:19:24.381 INFO [main]
 org.apache.catalina.core.StandardService.stopInternal Stopping service
 Tomcat
 
 ...
 
  [junit] 12-Jul-2012 13:19:24.769 INFO [main]
 org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
 [http-nio-127.0.0.1-auto-3-48253]
  [junit] 12-Jul-2012 13:19:24.795 SEVERE
 [http-nio-127.0.0.1-auto-3-exec-1]
 org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process
 null
  [junit]  java.lang.IllegalArgumentException: Negative timeout
  [junit] at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
  [junit] at
 org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267
 )
  [junit] at
 org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227
 )
  [junit] at
 org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeN
 ioProcessor.java:139)
  [junit] at
 org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProc
 essor.java:98)
  [junit] at
 org.apache.catalina.websocket.WsFrame.blockingRead(WsFrame.java:149)
  [junit] at
 org.apache.catalina.websocket.WsFrame.init(WsFrame.java:66)
  [junit] at
 org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:215)
  [junit] at
 org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java
 :68)
  [junit] at
 org.apache.catalina.websocket.WsInputStream.makePayloadDataAvailable(WsI
 nputStream.java:136)
  [junit] at
 org.apache.catalina.websocket.WsInputStream.read(WsInputStream.java:103)
  [junit] at
 

Re: svn commit: r1360905 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

[Mark Thomas]

On 12/07/2012 21:42, Filip Hanik (mailing lists) wrote:
 You are correct, I was chasing down the following:
 
 Testsuite: org.apache.catalina.websocket.TestWebSocket
 Tests run: 6, Failures: 1, Errors: 0, Time elapsed: 2.048 sec
 
 INFO: Starting ProtocolHandler [http-nio-127.0.0.1-auto-2-9027]
 Jul 12, 2012 11:56:27 AM 
 org.apache.coyote.AbstractProtocol$AbstractConnectionHandler process
 SEVERE: null
 java.lang.IllegalArgumentException: Negative timeout
   at sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
   at 
 org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267)
   at 
 org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227)
   at 
 org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeNioProcessor.java:139)
   at 
 org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProcessor.java:112)
   at org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:213)
   at 
 org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java:68)
   at 
 org.apache.catalina.websocket.StreamInbound.onData(StreamInbound.java:117)
   at 
 org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(UpgradeProcessor.java:83)
   at 
 org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:583)
   at 
 org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.process(Http11NioProtocol.java:223)
   at 
 org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.java:1676)
   at 
 java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110)
   at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603)
   at java.lang.Thread.run(Thread.java:722)
 
 We should not use -1 in our unit tests. I'm tempted to get rid of the -1 
 notion all together, no sane person should ever use no timeout :)

I do remember that the interpretation of -1 varied across the connectors
and I spent some time going through them making the handing consistent.
Looks like I missed a case there. Sorry.

There was a requirement for infinite timeouts from multiple WebSockets
users so I think they'll have to stay (much as I'd like to get rid of them).

Mark

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

svn commit: r1360929 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java

[fhanik]

Author: fhanik
Date: Thu Jul 12 20:48:31 2012
New Revision: 1360929

URL: http://svn.apache.org/viewvc?rev=1360929view=rev
Log:
brain farts today. Must get the value of the keycount key

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

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java?rev=1360929r1=1360928r2=1360929view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioSelectorPool.java Thu Jul 
12 20:48:31 2012
@@ -199,7 +199,7 @@ public class NioSelectorPool {
 if (writeTimeout==0) {
 timedout = buf.hasRemaining();
 } else if (writeTimeout0) {
-selector.select();
+keycount = selector.select();
 } else {
 keycount = selector.select(writeTimeout);
 }
@@ -273,7 +273,7 @@ public class NioSelectorPool {
 if (readTimeout==0) {
 timedout = (read==0);
 } else if (readTimeout0) {
-selector.select();
+keycount = selector.select();
 } else {
 keycount = selector.select(readTimeout);
 }



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

svn commit: r1360933 - /tomcat/trunk/java/org/apache/catalina/core/

[markt]

Author: markt
Date: Thu Jul 12 20:51:27 2012
New Revision: 1360933

URL: http://svn.apache.org/viewvc?rev=1360933view=rev
Log:
Code clean-up for o.a.catalina.core
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterChain.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterRegistration.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationJspConfigDescriptor.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPart.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java

tomcat/trunk/java/org/apache/catalina/core/ApplicationServletRegistration.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationTaglibDescriptor.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1360933r1=1360932r2=1360933view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Jul 
12 20:51:27 2012
@@ -132,21 +132,20 @@ public class ApplicationContext
 /**
  * The context attributes for this context.
  */
-protected MapString,Object attributes =
-new ConcurrentHashMapString,Object();
+protected MapString,Object attributes = new ConcurrentHashMap();
 
 
 /**
  * List of read only attributes for this context.
  */
-private MapString,String readOnlyAttributes =
-new ConcurrentHashMapString,String();
+private final MapString,String readOnlyAttributes =
+new ConcurrentHashMap();
 
 
 /**
  * The Context instance with which we are associated.
  */
-private StandardContext context = null;
+private final StandardContext context;
 
 
 /**
@@ -163,14 +162,14 @@ public class ApplicationContext
 /**
  * The facade around this object.
  */
-private ServletContext facade = new ApplicationContextFacade(this);
+private final ServletContext facade = new ApplicationContextFacade(this);
 
 
 /**
  * The merged context initialization parameters for this Context.
  */
 private final ConcurrentHashMapString,String parameters =
-new ConcurrentHashMapString,String();
+new ConcurrentHashMap();
 
 
 /**
@@ -183,14 +182,13 @@ public class ApplicationContext
 /**
  * Thread local data used during request dispatch.
  */
-private ThreadLocalDispatchData dispatchData =
-new ThreadLocalDispatchData();
+private final ThreadLocalDispatchData dispatchData = new ThreadLocal();
 
 
 /**
  * Session Cookie config
  */
-private SessionCookieConfig sessionCookieConfig =
+private final SessionCookieConfig sessionCookieConfig =
 new ApplicationSessionCookieConfig();
 
 /**
@@ -230,7 +228,7 @@ public class ApplicationContext
  */
 @Override
 public EnumerationString getAttributeNames() {
-SetString names = new HashSetString();
+SetString names = new HashSet();
 names.addAll(attributes.keySet());
 return Collections.enumeration(names);
 }
@@ -617,7 +615,7 @@ public class ApplicationContext
 private SetString getResourcePathsInternal(DirContext resources,
 String path) {
 
-ResourceSetString set = new ResourceSetString();
+ResourceSetString set = new ResourceSet();
 try {
 listCollectionPaths(set, resources, path);
 } catch (NamingException e) {
@@ -971,7 +969,6 @@ public class ApplicationContext
 public T extends Filter T createFilter(ClassT c)
 throws 

Re: Current unit test behaviour for trunk using Java 7 on Solaris

[Filip Hanik Mailing Lists]

and properly fixed in 
http://svn.apache.org/viewvc?view=revisionrevision=1360929

- Original Message -
 From: Filip Hanik (mailing lists) devli...@hanik.com
 To: Tomcat Developers List dev@tomcat.apache.org
 Sent: Thursday, July 12, 2012 2:43:55 PM
 Subject: RE: Current unit test behaviour for trunk using Java 7 on Solaris
 
 Fixed in
 http://svn.apache.org/viewvc?view=revisionrevision=1360917
 
 DBCP should compile as well as JDBC-POOL with 1.7 now too
 
  -Original Message-
  From: Rainer Jung [mailto:rainer.j...@kippdata.de]
  Sent: Thursday, July 12, 2012 6:33 AM
  To: Tomcat Developers List
  Subject: Current unit test behaviour for trunk using Java 7 on
  Solaris
  
  Versions
  
  
  TC trunk r1360616 tested with Java 1.7.0_05 on Solaris 10 Sparc.
  
  Compiled everything with the same JVM version using
  
  compile.source=1.7
  compile.target=1.7
  
  except for DBCP which was compiled with Java 6.
  
  Unit test failures
  ==
  
  One test failure, namely
  org.apache.catalina.websocket.TestWebSocket for
  NIO:
  
  Testcase: testKey took 4.628 sec
  Testcase: testBug53339 took 0.262 sec
  Testcase: testSimple took 0.585 sec
   FAILED
  
  junit.framework.AssertionFailedError:
   at
  org.apache.catalina.websocket.TestWebSocket$WebSocketClient.readMessage(
  TestWebSocket.java:419)
   at
  org.apache.catalina.websocket.TestWebSocket$WebSocketClient.access$300(T
  estWebSocket.java:343)
   at
  org.apache.catalina.websocket.TestWebSocket.testSimple(TestWebSocket.jav
  a:99)
  
  Testcase: testNoConnection took 0.555 sec
  Testcase: testNoUpgrade took 0.425 sec
  Testcase: testDetectWrongVersion took 0.377 sec
  
  possibly due to the following exception which is not happening for
  BIO
  and APR (negative Timeout):
  
   [junit] 12-Jul-2012 13:19:24.329 INFO [main]
  org.apache.coyote.AbstractProtocol.pause Pausing ProtocolHandler
  [http-nio-127.0.0.1-auto-2-48250]
   [junit] 12-Jul-2012 13:19:24.330 SEVERE
  [http-nio-127.0.0.1-auto-2-exec-1]
  org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process
  null
   [junit]  java.lang.IllegalArgumentException: Negative timeout
   [junit] at
   sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
   [junit] at
  org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267
  )
   [junit] at
  org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227
  )
   [junit] at
  org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeN
  ioProcessor.java:139)
   [junit] at
  org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProc
  essor.java:112)
   [junit] at
  org.apache.catalina.websocket.WsFrame.nextFrame(WsFrame.java:213)
   [junit] at
  org.apache.catalina.websocket.WsInputStream.nextFrame(WsInputStream.java
  :68)
   [junit] at
  org.apache.catalina.websocket.StreamInbound.onData(StreamInbound.java:11
  7)
   [junit] at
  org.apache.coyote.http11.upgrade.UpgradeProcessor.upgradeDispatch(Upgrad
  eProcessor.java:83)
   [junit] at
  org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(Abs
  tractProtocol.java:583)
   [junit] at
  org.apache.coyote.http11.Http11NioProtocol$Http11ConnectionHandler.proce
  ss(Http11NioProtocol.java:223)
   [junit] at
  org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.run(NioEndpoint.j
  ava:1676)
   [junit] at
  java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.jav
  a:1110)
   [junit] at
  java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.ja
  va:603)
   [junit] at java.lang.Thread.run(Thread.java:722)
   [junit]
   [junit] 12-Jul-2012 13:19:24.381 INFO [main]
  org.apache.catalina.core.StandardService.stopInternal Stopping
  service
  Tomcat
  
  ...
  
   [junit] 12-Jul-2012 13:19:24.769 INFO [main]
  org.apache.coyote.AbstractProtocol.start Starting ProtocolHandler
  [http-nio-127.0.0.1-auto-3-48253]
   [junit] 12-Jul-2012 13:19:24.795 SEVERE
  [http-nio-127.0.0.1-auto-3-exec-1]
  org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process
  null
   [junit]  java.lang.IllegalArgumentException: Negative timeout
   [junit] at
   sun.nio.ch.SelectorImpl.select(SelectorImpl.java:97)
   [junit] at
  org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:267
  )
   [junit] at
  org.apache.tomcat.util.net.NioSelectorPool.read(NioSelectorPool.java:227
  )
   [junit] at
  org.apache.coyote.http11.upgrade.UpgradeNioProcessor.readSocket(UpgradeN
  ioProcessor.java:139)
   [junit] at
  org.apache.coyote.http11.upgrade.UpgradeNioProcessor.read(UpgradeNioProc
  essor.java:98)
   [junit] at
  org.apache.catalina.websocket.WsFrame.blockingRead(WsFrame.java:149)
   [junit] at
  

svn commit: r1360942 - in /tomcat/trunk/java/org/apache/catalina/core: StandardWrapper.java StandardWrapperValve.java

[markt]

Author: markt
Date: Thu Jul 12 21:06:42 2012
New Revision: 1360942

URL: http://svn.apache.org/viewvc?rev=1360942view=rev
Log:
Deprecate unused setters

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1360942r1=1360941r2=1360942view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu Jul 12 
21:06:42 2012
@@ -1585,7 +1585,7 @@ public class StandardWrapper extends Con
  */
 @Override
 public void incrementErrorCount(){
-swValve.setErrorCount(swValve.getErrorCount() + 1);
+swValve.incrementErrorCount();
 }
 
 public long getLoadTime() {

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1360942r1=1360941r2=1360942view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Thu 
Jul 12 21:06:42 2012
@@ -522,6 +522,10 @@ final class StandardWrapperValve
 return processingTime;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setProcessingTime(long processingTime) {
 this.processingTime = processingTime;
 }
@@ -530,6 +534,10 @@ final class StandardWrapperValve
 return maxTime;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setMaxTime(long maxTime) {
 this.maxTime = maxTime;
 }
@@ -538,6 +546,10 @@ final class StandardWrapperValve
 return minTime;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setMinTime(long minTime) {
 this.minTime = minTime;
 }
@@ -546,6 +558,10 @@ final class StandardWrapperValve
 return requestCount;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setRequestCount(int requestCount) {
 this.requestCount = requestCount;
 }
@@ -554,6 +570,14 @@ final class StandardWrapperValve
 return errorCount;
 }
 
+public void incrementErrorCount() {
+errorCount++;
+}
+
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setErrorCount(int errorCount) {
 this.errorCount = errorCount;
 }



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

svn commit: r1360943 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java java/org/apache/catalina/core/StandardWrapper.java java/org/apache/catalina

[markt]

Author: markt
Date: Thu Jul 12 21:07:48 2012
New Revision: 1360943

URL: http://svn.apache.org/viewvc?rev=1360943view=rev
Log:
Deprecation prior to removal in 8.0.x

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

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1360892,1360942

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java?rev=1360943r1=1360942r2=1360943view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 (original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationJspPropertyGroupDescriptor.java
 Thu Jul 12 21:07:48 2012
@@ -28,6 +28,10 @@ import org.apache.catalina.deploy.JspPro
 public class ApplicationJspPropertyGroupDescriptor
 implements JspPropertyGroupDescriptor{
 
+/**
+ * @deprecated  Will be made private in 8.0.x
+ */
+@Deprecated
 JspPropertyGroup jspPropertyGroup;
 
 

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1360943r1=1360942r2=1360943view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapper.java Thu 
Jul 12 21:07:48 2012
@@ -1655,7 +1655,7 @@ public class StandardWrapper extends Con
  */
 @Override
 public void incrementErrorCount(){
-swValve.setErrorCount(swValve.getErrorCount() + 1);
+swValve.incrementErrorCount();
 }
 
 public long getLoadTime() {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1360943r1=1360942r2=1360943view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
Thu Jul 12 21:07:48 2012
@@ -522,6 +522,10 @@ final class StandardWrapperValve
 return processingTime;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setProcessingTime(long processingTime) {
 this.processingTime = processingTime;
 }
@@ -530,6 +534,10 @@ final class StandardWrapperValve
 return maxTime;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setMaxTime(long maxTime) {
 this.maxTime = maxTime;
 }
@@ -538,6 +546,10 @@ final class StandardWrapperValve
 return minTime;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setMinTime(long minTime) {
 this.minTime = minTime;
 }
@@ -546,6 +558,10 @@ final class StandardWrapperValve
 return requestCount;
 }
 
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setRequestCount(int requestCount) {
 this.requestCount = requestCount;
 }
@@ -554,6 +570,14 @@ final class StandardWrapperValve
 return errorCount;
 }
 
+public void incrementErrorCount() {
+errorCount++;
+}
+
+/**
+ * Deprecated   unused
+ */
+@Deprecated
 public void setErrorCount(int errorCount) {
 this.errorCount = errorCount;
 }



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

svn commit: r1360946 - /tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

[markt]

Author: markt
Date: Thu Jul 12 21:10:13 2012
New Revision: 1360946

URL: http://svn.apache.org/viewvc?rev=1360946view=rev
Log:
Fix a FindBugs warning (increment of volatile not atomic)

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java?rev=1360946r1=1360945r2=1360946view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperValve.java Thu 
Jul 12 21:10:13 2012
@@ -20,6 +20,7 @@ package org.apache.catalina.core;
 
 
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
@@ -67,8 +68,8 @@ final class StandardWrapperValve
 private volatile long processingTime;
 private volatile long maxTime;
 private volatile long minTime = Long.MAX_VALUE;
-private volatile int requestCount;
-private volatile int errorCount;
+private final AtomicInteger requestCount = new AtomicInteger(0);
+private final AtomicInteger errorCount = new AtomicInteger(0);
 
 
 /**
@@ -100,7 +101,7 @@ final class StandardWrapperValve
 Throwable throwable = null;
 // This should be a Request attribute...
 long t1=System.currentTimeMillis();
-requestCount++;
+requestCount.incrementAndGet();
 StandardWrapper wrapper = (StandardWrapper) getContainer();
 Servlet servlet = null;
 Context context = (Context) wrapper.getParent();
@@ -522,64 +523,24 @@ final class StandardWrapperValve
 return processingTime;
 }
 
-/**
- * Deprecated   unused
- */
-@Deprecated
-public void setProcessingTime(long processingTime) {
-this.processingTime = processingTime;
-}
-
 public long getMaxTime() {
 return maxTime;
 }
 
-/**
- * Deprecated   unused
- */
-@Deprecated
-public void setMaxTime(long maxTime) {
-this.maxTime = maxTime;
-}
-
 public long getMinTime() {
 return minTime;
 }
 
-/**
- * Deprecated   unused
- */
-@Deprecated
-public void setMinTime(long minTime) {
-this.minTime = minTime;
-}
-
 public int getRequestCount() {
-return requestCount;
-}
-
-/**
- * Deprecated   unused
- */
-@Deprecated
-public void setRequestCount(int requestCount) {
-this.requestCount = requestCount;
+return requestCount.get();
 }
 
 public int getErrorCount() {
-return errorCount;
+return errorCount.get();
 }
 
 public void incrementErrorCount() {
-errorCount++;
-}
-
-/**
- * Deprecated   unused
- */
-@Deprecated
-public void setErrorCount(int errorCount) {
-this.errorCount = errorCount;
+errorCount.incrementAndGet();
 }
 
 @Override



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

svn commit: r1360949 - /tomcat/trunk/res/findbugs/filter-false-positives.xml

[markt]

Author: markt
Date: Thu Jul 12 21:14:03 2012
New Revision: 1360949

URL: http://svn.apache.org/viewvc?rev=1360949view=rev
Log:
Filter out a false positive

Modified:
tomcat/trunk/res/findbugs/filter-false-positives.xml

Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1360949r1=1360948r2=1360949view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Thu Jul 12 21:14:03 
2012
@@ -73,6 +73,12 @@
 Bug code=Dm /
   /Match
   Match
+!-- Sleep is of short duration and lock is required --
+Class name=org.apache.catalina.core.StandardWrapper /
+Method name=unload /
+Bug code=SWL /
+  /Match
+  Match
 !-- Field is only modified during Servlet load --
 Class name=org.apache.catalina.manager.host.HostManagerServlet /
 Bug code=MSF /



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

svn commit: r1360957 - in /tomcat/trunk/java/org/apache/catalina/core: StandardServer.java StandardService.java

[markt]

Author: markt
Date: Thu Jul 12 21:27:13 2012
New Revision: 1360957

URL: http://svn.apache.org/viewvc?rev=1360957view=rev
Log:
Fix FindBugs issues (sync on mutated object)

Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1360957r1=1360956r2=1360957view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Thu Jul 12 
21:27:13 2012
@@ -128,6 +128,7 @@ public final class StandardServer extend
  * The set of Services associated with this Server.
  */
 private Service services[] = new Service[0];
+private final Object servicesLock = new Object();
 
 
 /**
@@ -336,7 +337,7 @@ public final class StandardServer extend
 
 service.setServer(this);
 
-synchronized (services) {
+synchronized (servicesLock) {
 Service results[] = new Service[services.length + 1];
 System.arraycopy(services, 0, results, 0, services.length);
 results[services.length] = service;
@@ -518,7 +519,7 @@ public final class StandardServer extend
 if (name == null) {
 return (null);
 }
-synchronized (services) {
+synchronized (servicesLock) {
 for (int i = 0; i  services.length; i++) {
 if (name.equals(services[i].getName())) {
 return (services[i]);
@@ -536,7 +537,7 @@ public final class StandardServer extend
 @Override
 public Service[] findServices() {
 
-return (services);
+return services;
 
 }
 
@@ -561,7 +562,7 @@ public final class StandardServer extend
 @Override
 public void removeService(Service service) {
 
-synchronized (services) {
+synchronized (servicesLock) {
 int j = -1;
 for (int i = 0; i  services.length; i++) {
 if (service == services[i]) {
@@ -739,7 +740,7 @@ public final class StandardServer extend
 globalNamingResources.start();
 
 // Start our defined Services
-synchronized (services) {
+synchronized (servicesLock) {
 for (int i = 0; i  services.length; i++) {
 services[i].start();
 }

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1360957r1=1360956r2=1360957view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Thu Jul 12 
21:27:13 2012
@@ -80,6 +80,7 @@ public class StandardService extends Lif
  * The set of Connectors associated with this Service.
  */
 protected Connector connectors[] = new Connector[0];
+private final Object connectorsLock = new Object();
 
 /**
  *
@@ -204,7 +205,7 @@ public class StandardService extends Lif
 @Override
 public void addConnector(Connector connector) {
 
-synchronized (connectors) {
+synchronized (connectorsLock) {
 connector.setService(this);
 Connector results[] = new Connector[connectors.length + 1];
 System.arraycopy(connectors, 0, results, 0, connectors.length);
@@ -254,7 +255,7 @@ public class StandardService extends Lif
 @Override
 public Connector[] findConnectors() {
 
-return (connectors);
+return connectors;
 
 }
 
@@ -269,7 +270,7 @@ public class StandardService extends Lif
 @Override
 public void removeConnector(Connector connector) {
 
-synchronized (connectors) {
+synchronized (connectorsLock) {
 int j = -1;
 for (int i = 0; i  connectors.length; i++) {
 if (connector == connectors[i]) {
@@ -426,7 +427,7 @@ public class StandardService extends Lif
 }
 
 // Start our defined Connectors second
-synchronized (connectors) {
+synchronized (connectorsLock) {
 for (Connector connector: connectors) {
 try {
 // If it has already failed, don't try and start it
@@ -455,7 +456,7 @@ public class StandardService extends Lif
 protected void stopInternal() throws LifecycleException {
 
 // Pause connectors first
-synchronized (connectors) {
+synchronized (connectorsLock) {
 for (Connector connector: connectors) {
 try {
 connector.pause();
@@ -479,7 +480,7 @@ public class 

svn commit: r1360966 - /tomcat/trunk/java/org/apache/catalina/deploy/

[markt]

Author: markt
Date: Thu Jul 12 21:40:27 2012
New Revision: 1360966

URL: http://svn.apache.org/viewvc?rev=1360966view=rev
Log:
Code clean-up for o.a.catalina.deploy
 - Add final prompted by UCDetector
 - Java 7 use of 

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
tomcat/trunk/java/org/apache/catalina/deploy/JspPropertyGroup.java
tomcat/trunk/java/org/apache/catalina/deploy/NamingResources.java
tomcat/trunk/java/org/apache/catalina/deploy/ResourceBase.java
tomcat/trunk/java/org/apache/catalina/deploy/SecurityConstraint.java
tomcat/trunk/java/org/apache/catalina/deploy/ServletDef.java
tomcat/trunk/java/org/apache/catalina/deploy/SessionConfig.java
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java?rev=1360966r1=1360965r2=1360966view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextHandler.java Thu Jul 12 
21:40:27 2012
@@ -56,8 +56,7 @@ public class ContextHandler extends Reso
  * soapHeader[0] : namespaceURI
  * soapHeader[1] : localpart
  */
-private final HashMapString, String soapHeaders =
-new HashMapString, String();
+private final HashMapString, String soapHeaders = new HashMap();
 
 public IteratorString getLocalparts() {
 return soapHeaders.keySet().iterator();
@@ -81,7 +80,7 @@ public class ContextHandler extends Reso
 /**
  * The soapRole.
  */
-private final ArrayListString soapRoles = new ArrayListString();
+private final ArrayListString soapRoles = new ArrayList();
 
 public String getSoapRole(int i) {
 return this.soapRoles.get(i);
@@ -98,7 +97,7 @@ public class ContextHandler extends Reso
 /**
  * The portName.
  */
-private final ArrayListString portNames = new ArrayListString();
+private final ArrayListString portNames = new ArrayList();
 
 public String getPortName(int i) {
 return this.portNames.get(i);

Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java?rev=1360966r1=1360965r2=1360966view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextService.java Thu Jul 12 
21:40:27 2012
@@ -186,8 +186,7 @@ public class ContextService extends Reso
  *
  * The instantiation of the handler have to be done.
  */
-private final HashMapString, ContextHandler handlers =
-new HashMapString, ContextHandler();
+private final HashMapString, ContextHandler handlers = new HashMap();
 
 public IteratorString getHandlers() {
 return handlers.keySet().iterator();

Modified: tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java?rev=1360966r1=1360965r2=1360966view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/ContextTransaction.java Thu 
Jul 12 21:40:27 2012
@@ -41,7 +41,7 @@ public class ContextTransaction implemen
 /**
  * Holder for our configured properties.
  */
-private HashMapString, Object properties = new HashMapString, Object();
+private final HashMapString, Object properties = new HashMap();
 
 /**
  * Return a configured property.

Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java?rev=1360966r1=1360965r2=1360966view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterDef.java Thu Jul 12 
21:40:27 2012
@@ -130,7 +130,7 @@ public class FilterDef implements Serial
  * The set of initialization parameters for this filter, keyed by
  * parameter name.
  */
-private MapString, String parameters = new HashMapString, String();
+private final MapString, String parameters = new HashMap();
 
 public 

svn commit: r1360969 - in /tomcat/trunk/java/org/apache/catalina/deploy: InjectionTarget.java SecurityRoleRef.java

[markt]

Author: markt
Date: Thu Jul 12 21:45:37 2012
New Revision: 1360969

URL: http://svn.apache.org/viewvc?rev=1360969view=rev
Log:
Fix FindBugs warnings (Serializable classes with non-serializabe fields)

Modified:
tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java
tomcat/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java

Modified: tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java?rev=1360969r1=1360968r2=1360969view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/InjectionTarget.java Thu Jul 
12 21:45:37 2012
@@ -16,10 +16,15 @@
  */
 package org.apache.catalina.deploy;
 
+import java.io.Serializable;
+
 /**
  * @version $Id$
  */
-public class InjectionTarget {
+public class InjectionTarget implements Serializable {
+
+private static final long serialVersionUID = 1L;
+
 private String targetClass;
 private String targetName;
 

Modified: tomcat/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java?rev=1360969r1=1360968r2=1360969view=diff
==
--- tomcat/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/SecurityRoleRef.java Thu Jul 
12 21:45:37 2012
@@ -18,6 +18,8 @@
 
 package org.apache.catalina.deploy;
 
+import java.io.Serializable;
+
 
 /**
  * pRepresentation of a security role reference for a web application, as
@@ -29,11 +31,12 @@ package org.apache.catalina.deploy;
  * @since Tomcat 5.5
  */
 
-public class SecurityRoleRef {
+public class SecurityRoleRef implements Serializable {
 
+private static final long serialVersionUID = 1L;
 
-// - Properties
 
+// - Properties
 
 /**
  * The (required) role name.



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

[Bug 53542] New: Spelling mistake on 503 service unavailable page

[bugzilla]

https://issues.apache.org/bugzilla/show_bug.cgi?id=53542

  Priority: P2
Bug ID: 53542
  Assignee: dev@tomcat.apache.org
   Summary: Spelling mistake on 503 service unavailable page
  Severity: minor
Classification: Unclassified
OS: Windows Server 2003
  Reporter: apa...@buzer.co.uk
  Hardware: PC
Status: NEW
   Version: 1.2.37
 Component: isapi
   Product: Tomcat Connectors

The heading for the 503 service unavailable page currently reads Service
Temporary Unavailable.

This should read Service Temporarily Unavailable

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