[Bug 59641] getRequestDispatcher encodes URI
https://bz.apache.org/bugzilla/show_bug.cgi?id=59641 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #3 from Violeta Georgieva --- Hi, (In reply to Robert from comment #2) > OK, the web container does not decode the String, but should id force-encode > it? The colon character in the path part of an URL is not being encoded in > the original request, but it is encoded if I use the requestDispatcher to > forward the request. It looks inconsistent. > > -- > Robert Please ask your questions on tomcat users list. Regards, Violeta -- 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 59604] Invalid url-pattern in servlet mapping on s390x
https://bz.apache.org/bugzilla/show_bug.cgi?id=59604 --- Comment #23 from Mark Thomas --- Comment on attachment 33897 --> https://bz.apache.org/bugzilla/attachment.cgi?id=33897 log file with bare bones conf/web.xml Interesting. The exception is happening in the WebSocket ServletContainerInitializer. It looks to be complaining that the URL pattern is an empty string. However, the URL pattern is hard-coded to "/*". There is no more debugging logging we can enable that will shed any light on this. Some custom patches to add additional logging are going to be required. While I can provide suitable patches, shell access to a test environment would enable this to be investigated much faster. -- 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 59647] New: International Flight Tickets to Bloomington 1844.313.4854 International Air Ticket to Bloomington
https://bz.apache.org/bugzilla/show_bug.cgi?id=59647 Bug ID: 59647 Summary: International Flight Tickets to Bloomington 1844.313.4854 International Air Ticket to Bloomington Product: Tomcat 9 Version: 9.0.0.M1 Hardware: PC OS: Windows NT Status: NEW Severity: normal Priority: P2 Component: Jasper Assignee: dev@tomcat.apache.org Reporter: yuang...@yandex.com International Flight Tickets to Bloomington 1844.313.4854 International Air Ticket to Bloomington solution for all USA/CANADA clients. For any help of query call 1 877 313 4854 to get all tickets Bloomington account solution. @@Call, 1=877=313=4854 for all type help by tickets Bloomington Help Desk Book over PHONE phone number, domestic flights tickets tickets Bloomington Help Desk Book over PHONE Phone Number, tickets Bloomington Help Desk Phone Number, tickets Bloomington Help Desk Book over PHONE number, tickets Bloomington Airlines flying from USA Book over PHONE phone number,@@@ tickets Bloomington phone number, tickets Bloomington Airlines flying from USA Book over PHONE number, tickets Bloomington Flight Ticket Offers Deals 1844 313 4854 Bloomington Flight Ticket Deals Bloomington Flight Ticket Deals 1877 313 4854*** @Call 1 877 313 4854 Bloomington Book over PHONE phone number us, tickets Bloomington Airlines flying from USA Book over PHONE phone number Call))1 877 313 4854 (((tickets Bloomington domestic flights tickets Book over PHONE phone number, tickets Bloomington Help Desk Book over PHONE phone number, tickets Bloomington Book over PHONE number Call))1 877 313 4854 (((tickets Bloomington point of sale Book over PHONE phone number, tickets Bloomington Help Desk Book over PHONE phone number, tickets Bloomington customer care number Call))1 877 313 4854 (((tickets Bloomington Economy Book over PHONE phone number, tickets Bloomington Help Desk Book over PHONE phone number, tickets Bloomington customer care number Call))1 877 313 4854 (((tickets Bloomington Book over PHONE phone number Economy tickets Bloomington help number-tickets Bloomington Helpline Number; tickets Bloomington help phone number-tickets Bloomington Helpline Number, tickets Bloomington Help Desk Book over PHONE Toll free Number, tickets Bloomington Book over PHONE Telephone Number, tickets Bloomington Help Desk Book over PHONE Telephone number, tickets Bloomington Help Desk Book over PHONE contact number, tickets Bloomington Book over PHONE contact number, tickets Bloomington Airlines flying from USA Book over PHONE contact number. Call, tickets Bloomington Help Desk Book over PHONE phone number, domestic flights tickets tickets Bloomington Help Desk Book over PHONE Phone Number, tickets Bloomington Help Desk Phone Number, tickets Bloomington Help Desk Book over PHONE number, tickets Bloomington Airlines flying from USA Book over PHONE phone number, tickets Bloomington phone number, tickets Bloomington Airlines flying from USA Book over PHONE number, tickets Bloomington Book over PHONE phone number. It is very popular toll free number which Economyvide by tickets Bloomington Airlines flying from USA Book over PHONE, tickets Bloomington Customer Service Phone Number, tickets Bloomington Customer Service Number, tickets Bloomington Customer Book over PHONE Phone Number, tickets Bloomington Customer Book over PHONE Number, tickets Bloomington Customer Service Helpline Number, tickets Bloomington Customer Care Number, tickets Bloomington Book over PHONE team phone number. 1877-313-4854 tickets Bloomington Airlines flying from USA help telephone number, tickets Bloomington Airlines flying from USA help contact number, tickets Bloomington Airlines flying from USA Book over PHONE contact number, tickets Bloomington contact number, tickets Bloomington contact phone number, tickets Bloomington contact telephone number, tickets Bloomington 24 hour contact number, tickets Bloomington customer Book over PHONE contact number, tickets Bloomington customer service contact number, tickets Bloomington official number, tickets Bloomington official contact number, tickets Bloomington 877 contact number, tickets Bloomington toll free number, 877 number for tickets Bloomington Book over PHONE, tickets Bloomington 24/7 Book over PHONE phone number tickets Bloomington Economy Book over PHONE phone number,tickets Bloomington Economy Book over PHONE phone number,tickets Bloomington Economy help phone number, tickets Bloomington Economy Airlines flying from USA Book over PHONE number.tickets Bloomington Economy Book over PHONE number, tickets Bloomington Economy phone number, tickets Bloomington Economy Help Desk Book over PHONE number, tickets Bloomington Economy customer Book over PHONE number, tickets Bloomington Economy customer Book over PHONE phone number, tickets Bloomington Economy customer service phone number, ticke
[Bug 59647] International Flight Tickets to Bloomington 1844.313.4854 International Air Ticket to Bloomington
https://bz.apache.org/bugzilla/show_bug.cgi?id=59647 Coty Sutherland changed: What|Removed |Added Resolution|--- |INVALID Status|NEW |RESOLVED --- Comment #1 from Coty Sutherland --- Spam. -- 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: r1746304 - /tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Author: markt
Date: Tue May 31 17:29:54 2016
New Revision: 1746304
URL: http://svn.apache.org/viewvc?rev=1746304&view=rev
Log:
Be consistent in ordering of method calls.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1746304&r1=1746303&r2=1746304&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue May 31
17:29:54 2016
@@ -130,8 +130,8 @@ public class StreamProcessor extends Abs
try {
stream.flushData();
} catch (IOException ioe) {
-response.setErrorException(ioe);
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
+response.setErrorException(ioe);
}
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1746306 - /tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Tue May 31 17:37:25 2016
New Revision: 1746306
URL: http://svn.apache.org/viewvc?rev=1746306&view=rev
Log:
Simplify.
If getErrorState().isError() is true then response.getErrorException() will
always be null.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
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=1746306&r1=1746305&r2=1746306&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 31
17:37:25 2016
@@ -1117,10 +1117,8 @@ public class Http11Processor extends Abs
// set the status to 500 and set the errorException.
// If we fail here, then the response is likely already
// committed, so we can't try and set headers.
-if(keepAlive && !getErrorState().isError() && (
-response.getErrorException() != null ||
-(!isAsync() &&
-
statusDropsConnection(response.getStatus() {
+if(keepAlive && !getErrorState().isError() && !isAsync() &&
+statusDropsConnection(response.getStatus())) {
setErrorState(ErrorState.CLOSE_CLEAN, null);
}
} catch (InterruptedIOException e) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1746307 - /tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Author: markt
Date: Tue May 31 17:40:56 2016
New Revision: 1746307
URL: http://svn.apache.org/viewvc?rev=1746307&view=rev
Log:
Be consistent in ordering of method calls. Missed this in r1746304.
Modified:
tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1746307&r1=1746306&r2=1746307&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue May 31
17:40:56 2016
@@ -367,8 +367,8 @@ public class StreamProcessor extends Abs
PushToken pushToken = (PushToken) param;
pushToken.setResult(stream.push(pushToken.getPushTarget()));
} catch (IOException ioe) {
-response.setErrorException(ioe);
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
+response.setErrorException(ioe);
}
break;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PATCH]
Am 27.05.2016 um 23:42 schrieb gradstud: Good afternoon, Your emails back and forth are all going through our graduate admissions email, can you please find another place for your Bugzilla, Apache, Tomcat business. You should find instructions to unsubscribe yourself from this mailinglist at the bottom of every mail sent by the list. Nonetheless, I will unsubscribe you on your request. Regards, Felix Thank you From: Sadik Kalia [mailto:kalia.sa...@gmail.com] Sent: Friday, May 27, 2016 3:36 PM To: dev@tomcat.apache.org Subject: [PATCH] Hello, I am new to Apache Tomcat. While i was reading the code i found something that i could change. In org.apache.catalina.users.MemoryGroup and org.apache.catalina.users.MemoryUser i have change the ArrayList to HashSet because i think HashSet will have better performance in this case and does not have to search for duplicates. I am sorry if i have not follow the procedure of submitting a patch. I would be very thankful if anyone explain the procedure to me. Please find attached with this email the patch i have provided. Thank you, Sadik Kalia - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1746319 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue May 31 18:50:12 2016
New Revision: 1746319
URL: http://svn.apache.org/viewvc?rev=1746319&view=rev
Log:
Refactor
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746319&r1=1746318&r2=1746319&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 31
18:50:12 2016
@@ -839,6 +839,12 @@ public class Nio2Endpoint extends Abstra
public IOException getError() { return error; }
public void setError(IOException error) { this.error = error; }
+public void checkError() throws IOException {
+IOException ioe = error;
+if (ioe != null) {
+throw ioe;
+}
+}
@Override
@@ -868,9 +874,7 @@ public class Nio2Endpoint extends Abstra
@Override
public int read(boolean block, byte[] b, int off, int len) throws
IOException {
-if (getError() != null) {
-throw getError();
-}
+checkError();
if (log.isDebugEnabled()) {
log.debug("Socket: [" + this + "], block: [" + block + "],
length: [" + len + "]");
@@ -1257,9 +1261,7 @@ public class Nio2Endpoint extends Abstra
@Override
protected void flushBlocking() throws IOException {
-if (getError() != null) {
-throw getError();
-}
+checkError();
// Before doing a blocking flush, make sure that any pending non
// blocking write has completed.
@@ -1278,10 +1280,7 @@ public class Nio2Endpoint extends Abstra
@Override
protected boolean flushNonBlocking() throws IOException {
-if (getError() != null) {
-throw getError();
-}
-
+checkError();
return flushNonBlocking(false);
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59604] Invalid url-pattern in servlet mapping on s390x
https://bz.apache.org/bugzilla/show_bug.cgi?id=59604 --- Comment #24 from Dave --- OK. Mark, I will send the z/OS shell access info to you. -- 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: r1746327 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue May 31 19:19:46 2016
New Revision: 1746327
URL: http://svn.apache.org/viewvc?rev=1746327&view=rev
Log:
Ensure all flushes will trigger an Exception if one has been set.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746327&r1=1746326&r2=1746327&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 31
19:19:46 2016
@@ -1280,11 +1280,11 @@ public class Nio2Endpoint extends Abstra
@Override
protected boolean flushNonBlocking() throws IOException {
-checkError();
return flushNonBlocking(false);
}
-private boolean flushNonBlocking(boolean hasPermit) {
+private boolean flushNonBlocking(boolean hasPermit) throws IOException
{
+checkError();
synchronized (writeCompletionHandler) {
if (hasPermit || writePending.tryAcquire()) {
socketBufferHandler.configureWriteBufferForRead();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1746338 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SocketWrapperBase.java
Author: markt
Date: Tue May 31 20:09:09 2016
New Revision: 1746338
URL: http://svn.apache.org/viewvc?rev=1746338&view=rev
Log:
Pull up error. It is going to be used more widely for propagating IOExceptions
in non-blocking reads and writes.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746338&r1=1746337&r2=1746338&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 31
20:09:09 2016
@@ -567,7 +567,6 @@ public class Nio2Endpoint extends Abstra
private final Semaphore writePending = new Semaphore(1);
private boolean writeInterest = false; // Guarded by
writeCompletionHandler
private boolean writeNotify = false;
-private volatile IOException error = null;
private CompletionHandler>
awaitBytesHandler
= new CompletionHandler>() {
@@ -837,16 +836,6 @@ public class Nio2Endpoint extends Abstra
public void setSendfileData(SendfileData sf) { this.sendfileData = sf;
}
public SendfileData getSendfileData() { return this.sendfileData; }
-public IOException getError() { return error; }
-public void setError(IOException error) { this.error = error; }
-public void checkError() throws IOException {
-IOException ioe = error;
-if (ioe != null) {
-throw ioe;
-}
-}
-
-
@Override
public boolean isReadyForRead() throws IOException {
synchronized (readCompletionHandler) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1746338&r1=1746337&r2=1746338&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Tue May
31 20:09:09 2016
@@ -61,6 +61,12 @@ public abstract class SocketWrapperBase<
private volatile boolean blockingStatus = true;
private final Lock blockingStatusReadLock;
private final WriteLock blockingStatusWriteLock;
+/*
+ * Used to record the first IOException that occurs during non-blocking
+ * read/writes that can't be usefully propagated up the stack since there
is
+ * no user code or appropriate container code in the stack to handle it.
+ */
+private volatile IOException error = null;
/**
* The buffers used for communicating with the socket.
@@ -97,6 +103,15 @@ public abstract class SocketWrapperBase<
return endpoint;
}
+public IOException getError() { return error; }
+public void setError(IOException error) { this.error = error; }
+public void checkError() throws IOException {
+IOException ioe = error;
+if (ioe != null) {
+throw ioe;
+}
+}
+
public boolean isUpgraded() { return upgraded; }
public void setUpgraded(boolean upgraded) { this.upgraded = upgraded; }
public boolean isSecure() { return secure; }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1746340 - /tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Author: markt
Date: Tue May 31 20:34:35 2016
New Revision: 1746340
URL: http://svn.apache.org/viewvc?rev=1746340&view=rev
Log:
No need to take defensive copy
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1746340&r1=1746339&r2=1746340&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Tue May
31 20:34:35 2016
@@ -104,11 +104,17 @@ public abstract class SocketWrapperBase<
}
public IOException getError() { return error; }
-public void setError(IOException error) { this.error = error; }
+public void setError(IOException error) {
+// Not perfectly thread-safe but good enough. Just needs to ensure that
+// once this.error is non-null, it can never be null.
+if (this.error != null) {
+return;
+}
+this.error = error;
+}
public void checkError() throws IOException {
-IOException ioe = error;
-if (ioe != null) {
-throw ioe;
+if (error != null) {
+throw error;
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1746341 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java Nio2Endpoint.java NioEndpoint.java SocketProcessorBase.java
Author: markt
Date: Tue May 31 20:35:15 2016
New Revision: 1746341
URL: http://svn.apache.org/viewvc?rev=1746341&view=rev
Log:
Introduce SocketProcessorBase and start to pull common SocketProcessor
functionality into it.
Added:
tomcat/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java
(with props)
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746341&r1=1746340&r2=1746341&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue May 31
20:35:15 2016
@@ -2244,33 +2244,25 @@ public class AprEndpoint extends Abstrac
* This class is the equivalent of the Worker, but will simply use in an
* external Executor thread pool.
*/
-protected class SocketProcessor implements Runnable {
-
-private final SocketWrapperBase socket;
-private final SocketEvent status;
+protected class SocketProcessor extends SocketProcessorBase {
public SocketProcessor(SocketWrapperBase socket,
-SocketEvent status) {
-this.socket = socket;
-if (status == null) {
-// Should never happen
-throw new NullPointerException();
-}
-this.status = status;
+SocketEvent event) {
+super(socket, event);
}
@Override
public void run() {
-synchronized (socket) {
+synchronized (socketWrapper) {
// Process the request from this socket
-if (socket.getSocket() == null) {
+if (socketWrapper.getSocket() == null) {
// Closed in another thread
return;
}
-SocketState state = getHandler().process(socket, status);
+SocketState state = getHandler().process(socketWrapper, event);
if (state == Handler.SocketState.CLOSED) {
// Close socket and pool
-closeSocket(socket.getSocket().longValue());
+closeSocket(socketWrapper.getSocket().longValue());
}
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746341&r1=1746340&r2=1746341&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 31
20:35:15 2016
@@ -1624,44 +1624,36 @@ public class Nio2Endpoint extends Abstra
* This class is the equivalent of the Worker, but will simply use in an
* external Executor thread pool.
*/
-protected class SocketProcessor implements Runnable {
+protected class SocketProcessor extends SocketProcessorBase {
-private SocketWrapperBase socket = null;
-private SocketEvent status = null;
-
-public SocketProcessor(SocketWrapperBase socket,
SocketEvent status) {
-reset(socket,status);
-}
-
-public void reset(SocketWrapperBase socket, SocketEvent
status) {
-this.socket = socket;
-this.status = status;
+public SocketProcessor(SocketWrapperBase socketWrapper,
SocketEvent event) {
+super(socketWrapper, event);
}
@Override
public void run() {
-synchronized (socket) {
-if (SocketEvent.OPEN_WRITE != status) {
+synchronized (socketWrapper) {
+if (SocketEvent.OPEN_WRITE != event) {
// Anything other than OPEN_WRITE is a genuine read or an
// error condition so for all of those release the
semaphore
-((Nio2SocketWrapper) socket).releaseReadPending();
+((Nio2SocketWrapper) socketWrapper).releaseReadPending();
}
boolean launch = false;
try {
int handshake = -1;
try {
-if (socket.getSocket() != null) {
+if (socketWrapper.getSocket() != null) {
// For STOP there is no point trying to handshake
as the
// Poller has been stopped.
-if (!socket.getSocket().isHandshakeComplete() &&
status
svn commit: r1746344 - in /tomcat/trunk/java/org/apache: coyote/ coyote/http11/ tomcat/util/net/
Author: markt
Date: Tue May 31 21:03:17 2016
New Revision: 1746344
URL: http://svn.apache.org/viewvc?rev=1746344&view=rev
Log:
SocketWrapperBase.socket is final and is always created non-null.
Remove unnecessary null checks
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1746344&r1=1746343&r2=1746344&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Tue May 31
21:03:17 2016
@@ -716,10 +716,6 @@ public abstract class AbstractProtocol socketWrapper) {
S socket = socketWrapper.getSocket();
-if (socket != null) {
-Processor processor = connections.remove(socket);
-//getProtocol().removeWaitingProcessor(processor);
-release(processor);
-}
+Processor processor = connections.remove(socket);
+//getProtocol().removeWaitingProcessor(processor);
+release(processor);
}
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=1746344&r1=1746343&r2=1746344&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 31
21:03:17 2016
@@ -825,7 +825,7 @@ public class Http11Processor extends Abs
break;
}
case REQ_SSL_CERTIFICATE: {
-if (sslSupport != null && socketWrapper.getSocket() != null) {
+if (sslSupport != null) {
// Consume and buffer the request body, so that it does not
// interfere with the client's handshake messages
InputFilter[] inputFilters = inputBuffer.getFilters();
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746344&r1=1746343&r2=1746344&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue May 31
21:03:17 2016
@@ -2255,10 +2255,6 @@ public class AprEndpoint extends Abstrac
public void run() {
synchronized (socketWrapper) {
// Process the request from this socket
-if (socketWrapper.getSocket() == null) {
-// Closed in another thread
-return;
-}
SocketState state = getHandler().process(socketWrapper, event);
if (state == Handler.SocketState.CLOSED) {
// Close socket and pool
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746344&r1=1746343&r2=1746344&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue May 31
21:03:17 2016
@@ -424,12 +424,10 @@ public class Nio2Endpoint extends Abstra
if (log.isDebugEnabled()) log.error("",e);
}
try {
-if (socket.getSocket() != null) {
-synchronized (socket.getSocket()) {
-if (socket.getSocket() != null &&
socket.getSocket().isOpen()) {
-countDownConnection();
-socket.getSocket().close(true);
-}
+synchronized (socket.getSocket()) {
+if (socket.getSocket().isOpen()) {
+countDownConnection();
+socket.getSocket().close(true);
}
}
} catch (Throwable e) {
@@ -942,10 +940,7 @@ public class Nio2Endpoint extends Abstra
@Override
public void close() throws IOException {
-Nio2Channel socket = getSocket();
-if (s
svn commit: r1746346 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http2/StreamProcessor.java
Author: markt
Date: Tue May 31 21:04:50 2016
New Revision: 1746346
URL: http://svn.apache.org/viewvc?rev=1746346&view=rev
Log:
Be consistent in ordering of method calls.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 21:04:50 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746307
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1746346&r1=1746345&r2=1746346&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Tue
May 31 21:04:50 2016
@@ -130,8 +130,8 @@ public class StreamProcessor extends Abs
try {
stream.flushData();
} catch (IOException ioe) {
-response.setErrorException(ioe);
setErrorState(ErrorState.CLOSE_CONNECTION_NOW, ioe);
+response.setErrorException(ioe);
}
break;
}
@@ -367,8 +367,8 @@ public class StreamProcessor extends Abs
PushToken pushToken = (PushToken) param;
pushToken.setResult(stream.push(pushToken.getPushTarget()));
} catch (IOException ioe) {
-response.setErrorException(ioe);
setErrorState(ErrorState.CLOSE_CONNECT
svn commit: r1746347 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/http11/Http11Processor.java
Author: markt
Date: Tue May 31 21:05:12 2016
New Revision: 1746347
URL: http://svn.apache.org/viewvc?rev=1746347&view=rev
Log:
If getErrorState().isError() is true then response.getErrorException() will
always be null.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 21:05:12 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746307
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1746347&r1=1746346&r2=1746347&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue
May 31 21:05:12 2016
@@ -1117,10 +1117,8 @@ public class Http11Processor extends Abs
// set the status to 500 and set the errorException.
// If we fail here, then the response is likely already
// committed, so we can't try and set headers.
-if(keepAlive && !getErrorState().isError() && (
-response.getErrorException() != null ||
-(!isAsync() &&
-
statusDropsConnection(response.getStatus() {
+if(keepAlive && !getErrorState().isError() && !isAsync()
svn commit: r1746348 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/Nio2Endpoint.java
Author: markt
Date: Tue May 31 21:06:07 2016
New Revision: 1746348
URL: http://svn.apache.org/viewvc?rev=1746348&view=rev
Log:
Refactor
Ensure all flushes will trigger an Exception if one has been set.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 21:06:07 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746348&r1=1746347&r2=1746348&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue
May 31 21:06:07 2016
@@ -839,6 +839,12 @@ public class Nio2Endpoint extends Abstra
public IOException getError() { return error; }
public void setError(IOException error) { this.error = error; }
+public void checkError() throws IOException {
+IOException ioe = error;
+if (ioe != null) {
+throw ioe;
+}
+}
@Override
@@ -868,9 +874,7 @@ public class Nio2Endpoint extends Abstra
@Override
public int read(boolean block, byte[] b, int off, int len) throws
IOException {
-if (getError() != null) {
-throw getErro
svn commit: r1746349 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/Nio2Endpoint.java java/org/apache/tomcat/util/net/SocketWrapperBase.java
Author: markt
Date: Tue May 31 21:06:47 2016
New Revision: 1746349
URL: http://svn.apache.org/viewvc?rev=1746349&view=rev
Log:
Pull up error. It is going to be used more widely for propagating IOExceptions
in non-blocking reads and writes.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 21:06:47 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340
Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1746349&r1=1746348&r2=1746349&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue
May 31 21:06:47 2016
@@ -567,7 +567,6 @@ public class Nio2Endpoint extends Abstra
private final Semaphore writePending = new Semaphore(1);
private boolean writeInterest = false; // Guarded by
writeCompletionHandler
private boolean writeNotify = false;
-private volatile IOException error = null;
private CompletionHandler>
awaitBytesHandler
= new CompletionHandler>() {
@@ -837,16 +836,6 @@ public class Nio2Endpoint extends Abstra
p
svn commit: r1746350 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/tomcat/util/net/
Author: markt Date: Tue May 31 21:07:17 2016 New Revision: 1746350 URL: http://svn.apache.org/viewvc?rev=1746350&view=rev Log: Introduce SocketProcessorBase and start to pull common SocketProcessor functionality into it. Added: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java - copied unchanged from r1746341, tomcat/trunk/java/org/apache/tomcat/util/net/SocketProcessorBase.java Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Tue May 31 21:07:17 2016 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340 +/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677 ,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341 Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1746350&r1=1746349&r2=1746350&view=diff == --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue May 31 21:07:17 2016 @@ -2250,33 +2250,25 @@ public class AprEndpoint extends Abstrac * This class is the equivalent of the Worker, but will simply use in an * external Executor thread pool. */ -protected class Sock
svn commit: r1746351 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/http11/ java/org/apache/tomcat/util/net/
Author: markt
Date: Tue May 31 21:17:59 2016
New Revision: 1746351
URL: http://svn.apache.org/viewvc?rev=1746351&view=rev
Log:
SocketWrapperBase.socket is final and is always created non-null.
Remove unnecessary null checks
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioBlockingSelector.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java
Propchange: tomcat/tc8.5.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 31 21:17:59 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501,1741677
,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1746351&r1=1746350&r2=1746351&view=diff
==
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java Tue May
31 21:17:59 2016
@@ -716,10 +716,6 @@ public abstract class AbstractProtocol socketWrapper) {
S socket = socket
