Replacing tcnative java classes by svn:externals?
We still have copies of the tcnative Java classes inside tcnative at tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni The maintained classes are in tomcat/trunk/java/org/apache/tomcat/jni and the two copies slowly drift away from each other. I suggest we remove tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni and replace it with an svn external pointing to tomcat/trunk/java/org/apache/tomcat/jni (the same for tcnative trunk). I would then check, that the tcnative release script still correctly includes those classes. Some Java classes would remain inside tcnative as their authoritative source, namely the test classes and native/branches/1.1.x/java/org/apache/tomcat/Apr.java native/branches/1.1.x/java/org/apache/tomcat/apr.properties The two classes native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java native/branches/1.1.x/java/org/apache/tomcat/jni/Thread.java would vanish, because they are only in tcnative and not yet in Tomcat itself. We can copy them over from history to Tomcat if we want or need them back. Anything I have overlooked? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Replacing tcnative java classes by svn:externals?
On 06/08/2011 19:51, Rainer Jung wrote: > Anything I have overlooked? Tagging. If you use an external, you have to be very careful creating tags else the contents of the tag will appear to change over time. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1154571 - /tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
Author: markt
Date: Sat Aug 6 19:24:49 2011
New Revision: 1154571
URL: http://svn.apache.org/viewvc?rev=1154571&view=rev
Log:
Remove error message since a) it is provides very little / no useful
information and b) writing to stderr is just plain wrong.
Modified:
tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java?rev=1154571&r1=1154570&r2=1154571&view=diff
==
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagLibraryInfo.java Sat Aug 6
19:24:49 2011
@@ -198,7 +198,6 @@ public abstract class TagLibraryInfo {
public FunctionInfo getFunction(String name) {
if (functions == null || functions.length == 0) {
-System.err.println("No functions");
return null;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1154574 - in /tomcat/trunk: java/org/apache/juli/DateFormatCache.java java/org/apache/juli/FileHandler.java res/findbugs/filter-false-positives.xml webapps/docs/changelog.xml
Author: markt
Date: Sat Aug 6 20:00:39 2011
New Revision: 1154574
URL: http://svn.apache.org/viewvc?rev=1154574&view=rev
Log:
Fix a small number of warnings reported by FindBugs.
Modified:
tomcat/trunk/java/org/apache/juli/DateFormatCache.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/juli/DateFormatCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/DateFormatCache.java?rev=1154574&r1=1154573&r2=1154574&view=diff
==
--- tomcat/trunk/java/org/apache/juli/DateFormatCache.java (original)
+++ tomcat/trunk/java/org/apache/juli/DateFormatCache.java Sat Aug 6 20:00:39
2011
@@ -53,7 +53,6 @@ public class DateFormatCache {
/* Number of cached entries */
private int cacheSize = 0;
-private DateFormatCache parent;
private Cache cache;
/**
@@ -85,7 +84,6 @@ public class DateFormatCache {
public DateFormatCache(int size, String format, DateFormatCache parent) {
cacheSize = size;
this.format = tidyFormat(format);
-this.parent = parent;
Cache parentCache = null;
if (parent != null) {
synchronized(parent) {
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1154574&r1=1154573&r2=1154574&view=diff
==
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Sat Aug 6 20:00:39 2011
@@ -173,12 +173,13 @@ public class FileHandler
String tsDate = tsString.substring(0, 10);
writerLock.readLock().lock();
-// If the date has changed, switch log files
-if (rotatable && !date.equals(tsDate)) {
-// Update to writeLock before we switch
-writerLock.readLock().unlock();
-writerLock.writeLock().lock();
-try {
+try {
+// If the date has changed, switch log files
+if (rotatable && !date.equals(tsDate)) {
+// Update to writeLock before we switch
+writerLock.readLock().unlock();
+writerLock.writeLock().lock();
+
// Make sure another thread hasn't already done this
if (!date.equals(tsDate)) {
closeWriter();
@@ -188,9 +189,9 @@ public class FileHandler
// Down grade to read-lock. This ensures the writer remains
valid
// until the log message is written
writerLock.readLock().lock();
-} finally {
-writerLock.writeLock().unlock();
}
+} finally {
+writerLock.writeLock().unlock();
}
try {
@@ -362,7 +363,12 @@ public class FileHandler
// Create the directory if necessary
File dir = new File(directory);
-dir.mkdirs();
+if (!dir.mkdirs()) {
+reportError("Unable to create [" + dir + "]", null,
+ErrorManager.OPEN_FAILURE);
+writer = null;
+return;
+}
// Open the current log file
writerLock.writeLock().lock();
@@ -371,7 +377,12 @@ public class FileHandler
+ (rotatable ? date : "") + suffix);
File parent = pathname.getParentFile();
if (!parent.exists()) {
-parent.mkdirs();
+if (!parent.mkdirs()) {
+reportError("Unable to create [" + parent + "]", null,
+ErrorManager.OPEN_FAILURE);
+writer = null;
+return;
+}
}
String encoding = getEncoding();
FileOutputStream fos = new FileOutputStream(pathname, true);
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1154574&r1=1154573&r2=1154574&view=diff
==
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Sat Aug 6 20:00:39
2011
@@ -52,6 +52,11 @@
+
+
+
+
+
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1154574&r1=1154573&r2=1154574&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sat Aug 6 20:00:39 2011
@@ -293,6 +293,9 @@
svn commit: r1154575 - in /tomcat/trunk/java/org/apache: catalina/tribes/ catalina/tribes/transport/ tomcat/util/ tomcat/util/bcel/classfile/ tomcat/util/digester/ tomcat/util/http/fileupload/ tomcat/
Author: markt
Date: Sat Aug 6 20:19:29 2011
New Revision: 1154575
URL: http://svn.apache.org/viewvc?rev=1154575&view=rev
Log:
Missing @Override markers
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java
tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/WithDefaultsRulesWrapper.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/FileUploadBase.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/MultipartStream.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItem.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/disk/DiskFileItemFactory.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/FileItemHeadersImpl.java
tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/util/LimitedInputStream.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/FixedNotificationFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansSource.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java?rev=1154575&r1=1154574&r2=1154575&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/MessageListener.java Sat Aug
6 20:19:29 2011
@@ -36,8 +36,10 @@ public interface MessageListener {
public boolean accept(ChannelMessage msg);
+@Override
public boolean equals(Object listener);
+@Override
public int hashCode();
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java?rev=1154575&r1=1154574&r2=1154575&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/MultiPointSender.java
Sat Aug 6 20:19:29 2011
@@ -29,8 +29,6 @@ import org.apache.catalina.tribes.Member
public interface MultiPointSender extends DataSender
{
public void sendMessage(Member[] destination, ChannelMessage data) throws
ChannelException;
-public void setRxBufSize(int size);
-public void setTxBufSize(int size);
public void setMaxRetryAttempts(int attempts);
public void setDirectBuffer(boolean directBuf);
public void add(Member member);
Modified: tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java?rev=1154575&r1=1154574&r2=1154575&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Sat Aug 6
20:19:29 2011
@@ -594,6 +594,7 @@ public final class IntrospectionUtils {
final String lext = ext;
if (dir.isDirectory()) {
names = dir.list(new FilenameFilter() {
+@Override
public boolean accept(File d, String name) {
if (name.endsWith(lext)) {
return true;
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java?rev=1154575&r1=1154574&r2=1154575&view=diff
==
---
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/LocalVariableTable.java
Sat Aug 6 20:19:29 2011
@@ -96,6 +96,7 @@ public class LocalVariableTable extends
* @deprecated since 5.2 because multiple variables can share the
* same slot, use getLocalVariable(int index, int pc) instead.
*/
+@java.lang.Deprecated
public final LocalVariable getLocalVariable( int index ) {
for (int i = 0; i < local_variable_table_length; i++) {
if (local_variable_table[i].
svn commit: r1154579 - in /tomcat/trunk/java/org/apache/jasper/compiler: JspUtil.java PageDataImpl.java Validator.java
Author: markt
Date: Sat Aug 6 20:28:35 2011
New Revision: 1154579
URL: http://svn.apache.org/viewvc?rev=1154579&view=rev
Log:
Fix some false npe warnings
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=1154579&r1=1154578&r2=1154579&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Sat Aug 6
20:28:35 2011
@@ -119,6 +119,7 @@ public class JspUtil {
int tempLength = (attrs == null) ? 0 : attrs.getLength();
Vector temp = new Vector(tempLength, 1);
for (int i = 0; i < tempLength; i++) {
+@SuppressWarnings("null") // If attrs==null, tempLength == 0
String qName = attrs.getQName(i);
if ((!qName.equals("xmlns")) && (!qName.startsWith("xmlns:")))
temp.addElement(qName);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java?rev=1154579&r1=1154578&r2=1154579&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/PageDataImpl.java Sat Aug 6
20:28:35 2011
@@ -510,6 +510,7 @@ class PageDataImpl extends PageData impl
Attributes attrs = n.getAttributes();
int len = (attrs == null) ? 0 : attrs.getLength();
for (int i=0; ihttp://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=1154579&r1=1154578&r2=1154579&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sat Aug 6
20:28:35 2011
@@ -896,6 +896,7 @@ class Validator {
if (attrs == null) {
err.jspError(n, "jsp.error.jspelement.missing.name");
}
+@SuppressWarnings("null") // Exception will have been thrown above
int xmlAttrLen = attrs.getLength();
Node.Nodes namedAttrs = n.getNamedAttributeNodes();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1154583 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java
Author: markt Date: Sat Aug 6 20:49:52 2011 New Revision: 1154583 URL: http://svn.apache.org/viewvc?rev=1154583&view=rev Log: Start to align process method Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1154583&r1=1154582&r2=1154583&view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sat Aug 6 20:49:52 2011 @@ -161,6 +161,9 @@ public class Http11AprProcessor extends * Process pipelined HTTP requests using the specified input and output * streams. * + * @param socketWrapper Socket from which the HTTP requests will be read + * and the HTTP responses will be written. + * * @throws IOException error during an I/O operation */ @Override @@ -177,8 +180,8 @@ public class Http11AprProcessor extends // Error flag error = false; -comet = false; keepAlive = true; +comet = false; int keepAliveLeft = maxKeepAliveRequests; long soTimeout = endpoint.getSoTimeout(); Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1154583&r1=1154582&r2=1154583&view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sat Aug 6 20:49:52 2011 @@ -192,6 +192,9 @@ public class Http11NioProcessor extends * Process pipelined HTTP requests using the specified input and output * streams. * + * @param socketWrapper Socket from which the HTTP requests will be read + * and the HTTP responses will be written. + * * @throws IOException error during an I/O operation */ @Override Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1154583&r1=1154582&r2=1154583&view=diff == --- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Sat Aug 6 20:49:52 2011 @@ -122,7 +122,8 @@ public class Http11Processor extends Abs /** - * Process pipelined HTTP requests on the specified socket. + * Process pipelined HTTP requests using the specified input and output + * streams. * * @param socketWrapper Socket from which the HTTP requests will be read * and the HTTP responses will be written. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1154584 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Author: markt
Date: Sat Aug 6 20:56:54 2011
New Revision: 1154584
URL: http://svn.apache.org/viewvc?rev=1154584&view=rev
Log:
Align HTTP NIO with BIO and APR and hold a reference to the socket wrapper not
the raw socket in the Processor.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1154584&r1=1154583&r2=1154584&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sat Aug
6 20:56:54 2011
@@ -106,7 +106,7 @@ public class Http11NioProcessor extends
/**
* Socket associated with the current connection.
*/
-protected NioChannel socket = null;
+protected SocketWrapper socket = null;
// - Public Methods
@@ -126,7 +126,7 @@ public class Http11NioProcessor extends
int keepAliveTimeout = endpoint.getKeepAliveTimeout();
RequestInfo rp = request.getRequestProcessor();
-final NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
+final NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
error = !adapter.event(request, response, status);
@@ -172,7 +172,7 @@ public class Http11NioProcessor extends
@Override
protected void resetTimeouts() {
-final NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
+final NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socket.getSocket().getAttachment(false);
if (!error && attach != null &&
asyncStateMachine.isAsyncDispatching()) {
long soTimeout = endpoint.getSoTimeout();
@@ -204,9 +204,9 @@ public class Http11NioProcessor extends
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
// Setting up the socket
-this.socket = socket.getSocket();
-inputBuffer.setSocket(this.socket);
-outputBuffer.setSocket(this.socket);
+this.socket = socket;
+inputBuffer.setSocket(this.socket.getSocket());
+outputBuffer.setSocket(this.socket.getSocket());
inputBuffer.setSelectorPool(((NioEndpoint)endpoint).getSelectorPool());
outputBuffer.setSelectorPool(((NioEndpoint)endpoint).getSelectorPool());
@@ -429,7 +429,7 @@ public class Http11NioProcessor extends
comet = false;
cometClose = true;
-SelectionKey key =
socket.getIOChannel().keyFor(socket.getPoller().getSelector());
+SelectionKey key =
socket.getSocket().getIOChannel().keyFor(socket.getSocket().getPoller().getSelector());
if ( key != null ) {
NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)
key.attachment();
if ( attach!=null && attach.getComet()) {
@@ -452,7 +452,7 @@ public class Http11NioProcessor extends
// Get remote host address
if ((remoteAddr == null) && (socket != null)) {
-InetAddress inetAddr =
socket.getIOChannel().socket().getInetAddress();
+InetAddress inetAddr =
socket.getSocket().getIOChannel().socket().getInetAddress();
if (inetAddr != null) {
remoteAddr = inetAddr.getHostAddress();
}
@@ -463,7 +463,7 @@ public class Http11NioProcessor extends
// Get local host name
if ((localName == null) && (socket != null)) {
-InetAddress inetAddr =
socket.getIOChannel().socket().getLocalAddress();
+InetAddress inetAddr =
socket.getSocket().getIOChannel().socket().getLocalAddress();
if (inetAddr != null) {
localName = inetAddr.getHostName();
}
@@ -474,7 +474,7 @@ public class Http11NioProcessor extends
// Get remote host name
if ((remoteHost == null) && (socket != null)) {
-InetAddress inetAddr =
socket.getIOChannel().socket().getInetAddress();
+InetAddress inetAddr =
socket.getSocket().getIOChannel().socket().getInetAddress();
if (inetAddr != null) {
remoteHost = inetAddr.getHostName();
}
@@ -491,21 +491,21 @@ public class Http11NioProcessor extends
} else if (actionCode == ActionCode.REQ_LOCAL_ADDR_ATTRIBUTE) {
if (localAddr == null)
- localAddr =
socket.getIOChannel().socket().getLocalAddress().getHostAddress();
+
svn commit: r1154586 - in /tomcat/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11NioProcessor.java
Author: markt
Date: Sat Aug 6 20:58:51 2011
New Revision: 1154586
URL: http://svn.apache.org/viewvc?rev=1154586&view=rev
Log:
Rename socket -> socketWrapper
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1154586&r1=1154585&r2=1154586&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Sat Aug
6 20:58:51 2011
@@ -167,14 +167,14 @@ public class Http11AprProcessor extends
* @throws IOException error during an I/O operation
*/
@Override
-public SocketState process(SocketWrapper socket)
+public SocketState process(SocketWrapper socketWrapper)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
// Setting up the socket
-this.socket = socket;
-long socketRef = socket.getSocket().longValue();
+this.socket = socketWrapper;
+long socketRef = socketWrapper.getSocket().longValue();
inputBuffer.setSocket(socketRef);
outputBuffer.setSocket(socketRef);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1154586&r1=1154585&r2=1154586&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Sat Aug
6 20:58:51 2011
@@ -198,13 +198,13 @@ public class Http11NioProcessor extends
* @throws IOException error during an I/O operation
*/
@Override
-public SocketState process(SocketWrapper socket)
+public SocketState process(SocketWrapper socketWrapper)
throws IOException {
RequestInfo rp = request.getRequestProcessor();
rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
// Setting up the socket
-this.socket = socket;
+this.socket = socketWrapper;
inputBuffer.setSocket(this.socket.getSocket());
outputBuffer.setSocket(this.socket.getSocket());
inputBuffer.setSelectorPool(((NioEndpoint)endpoint).getSelectorPool());
@@ -224,11 +224,11 @@ public class Http11NioProcessor extends
while (!error && keepAlive && !comet && !isAsync() &&
!endpoint.isPaused()) {
//always default to our soTimeout
-socket.setTimeout(soTimeout);
+socketWrapper.setTimeout(soTimeout);
// Parsing the request header
try {
if( !disableUploadTimeout && keptAlive && soTimeout > 0 ) {
-
socket.getSocket().getIOChannel().socket().setSoTimeout((int)soTimeout);
+
socketWrapper.getSocket().getIOChannel().socket().setSoTimeout((int)soTimeout);
}
if (!inputBuffer.parseRequestLine(keptAlive)) {
// Haven't finished reading the request so keep the socket
@@ -239,7 +239,7 @@ public class Http11NioProcessor extends
// No data read, OK to recycle the processor
// Continue to use keep alive timeout
if (keepAliveTimeout>0) {
-socket.setTimeout(keepAliveTimeout);
+socketWrapper.setTimeout(keepAliveTimeout);
}
} else {
// Started to read request line. Need to keep processor
@@ -266,7 +266,7 @@ public class Http11NioProcessor extends
}
request.setStartTime(System.currentTimeMillis());
if (!disableUploadTimeout) { //only for body, not for
request headers
-
socket.getSocket().getIOChannel().socket().setSoTimeout(
+
socketWrapper.getSocket().getIOChannel().socket().setSoTimeout(
connectionUploadTimeout);
}
}
@@ -306,7 +306,7 @@ public class Http11NioProcessor extends
if (maxKeepAliveRequests == 1 )
keepAlive = false;
-if (maxKeepAliveRequests > 0 && socket.decrementKeepAlive() <= 0)
+if (maxKeepAliveRequests > 0 && socketWrapper.decrementKeepAlive()
<= 0)
keepAlive = false;
// Process the request in the adapter
@@ -325,8 +325,8 @@ public c
DO NOT REPLY [Bug 51630] New: java.lang.IllegalStateException: Calling [asyncComplete()]
https://issues.apache.org/bugzilla/show_bug.cgi?id=51630 Bug #: 51630 Summary: java.lang.IllegalStateException: Calling [asyncComplete()] Product: Tomcat 7 Version: 7.0.19 Platform: PC OS/Version: Windows XP Status: NEW Severity: normal Priority: P2 Component: Catalina AssignedTo: dev@tomcat.apache.org ReportedBy: zhh200...@gmail.com Classification: Unclassified example: webapps\examples\WEB-INF\classes\async\Async0.java log file: logs\localhost.2011-08-07.log = java.lang.IllegalStateException: Calling [asyncComplete()] is not valid for a request with Async state [DISPATCHED] at org.apache.coyote.AsyncStateMachine.asyncComplete(AsyncStateMachine.java:221) at org.apache.coyote.http11.Http11Processor.actionInternal(Http11Processor.java:525) at org.apache.coyote.http11.AbstractHttp11Processor.action(AbstractHttp11Processor.java:773) at org.apache.coyote.Request.action(Request.java:344) at org.apache.catalina.core.AsyncContextImpl.complete(AsyncContextImpl.java:89) at async.Async0.service(Async0.java:42) at javax.servlet.http.HttpServlet.service(HttpServlet.java:722) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:304) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:210) at org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:684) at org.apache.catalina.core.ApplicationDispatcher.doInclude(ApplicationDispatcher.java:593) at org.apache.catalina.core.ApplicationDispatcher.include(ApplicationDispatcher.java:530) at org.apache.catalina.core.AsyncContextImpl$1.run(AsyncContextImpl.java:173) at org.apache.catalina.core.AsyncContextImpl.doInternalDispatch(AsyncContextImpl.java:314) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:219) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:175) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:462) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:164) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:100) at org.apache.catalina.valves.AccessLogValve.invoke(AccessLogValve.java:851) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:118) at org.apache.catalina.connector.CoyoteAdapter.asyncDispatch(CoyoteAdapter.java:296) at org.apache.coyote.http11.AbstractHttp11Processor.asyncDispatch(AbstractHttp11Processor.java:1220) at org.apache.coyote.AbstractProtocol$AbstractConnectionHandler.process(AbstractProtocol.java:511) at org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor.run(JIoEndpoint.java:302) at java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908) at java.lang.Thread.run(Thread.java:619) -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- 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
