You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/05/18 15:03:24 UTC
[tomcat] branch master updated (2894522 -> 99e36dc)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 2894522 Fix async writes
new f488fb0 Refactor to avoid unnecessary null checks. Identified by Coverity Scan.
new 99e36dc Silence false positive IDE warning
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/connector/Request.java | 18 ++++++------------
java/org/apache/catalina/session/StandardSession.java | 10 +++++-----
.../catalina/storeconfig/ConnectorStoreAppender.java | 2 +-
.../org/apache/catalina/storeconfig/StoreAppender.java | 2 +-
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 +
5 files changed, 14 insertions(+), 19 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Refactor to avoid unnecessary null checks.
Identified by Coverity Scan.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f488fb08f8204126da79fd9d333c04d1ad936567
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat May 18 15:43:52 2019 +0100
Refactor to avoid unnecessary null checks. Identified by Coverity Scan.
---
java/org/apache/catalina/connector/Request.java | 18 ++++++------------
java/org/apache/catalina/session/StandardSession.java | 10 +++++-----
.../catalina/storeconfig/ConnectorStoreAppender.java | 2 +-
.../org/apache/catalina/storeconfig/StoreAppender.java | 2 +-
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java
index dbcd799..ec38789 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -2992,11 +2992,9 @@ public class Request implements HttpServletRequest {
if (!create) {
return null;
}
- if (response != null
- && context.getServletContext()
- .getEffectiveSessionTrackingModes()
- .contains(SessionTrackingMode.COOKIE)
- && response.getResponse().isCommitted()) {
+ boolean trackModesIncludesCookie =
+ context.getServletContext().getEffectiveSessionTrackingModes().contains(SessionTrackingMode.COOKIE);
+ if (trackModesIncludesCookie && response.getResponse().isCommitted()) {
throw new IllegalStateException(
sm.getString("coyoteRequest.sessionCreateCommitted"));
}
@@ -3045,13 +3043,9 @@ public class Request implements HttpServletRequest {
session = manager.createSession(sessionId);
// Creating a new session cookie based on that session
- if (session != null
- && context.getServletContext()
- .getEffectiveSessionTrackingModes()
- .contains(SessionTrackingMode.COOKIE)) {
- Cookie cookie =
- ApplicationSessionCookieConfig.createSessionCookie(
- context, session.getIdInternal(), isSecure());
+ if (session != null && trackModesIncludesCookie) {
+ Cookie cookie = ApplicationSessionCookieConfig.createSessionCookie(
+ context, session.getIdInternal(), isSecure());
response.addSessionCookieInternal(cookie);
}
diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java
index 685c5a1..7753212 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1413,10 +1413,11 @@ public class StandardSession implements HttpSession, Session, Serializable {
throw new IllegalStateException(
sm.getString("standardSession.setAttribute.ise", getIdInternal()));
}
- if ((manager != null) && manager.getContext().getDistributable() &&
- !isAttributeDistributable(name, value) && !exclude(name, value)) {
- throw new IllegalArgumentException(
- sm.getString("standardSession.setAttribute.iae", name));
+
+ Context context = manager.getContext();
+
+ if (context.getDistributable() && !isAttributeDistributable(name, value) && !exclude(name, value)) {
+ throw new IllegalArgumentException(sm.getString("standardSession.setAttribute.iae", name));
}
// Construct an event with the new value
HttpSessionBindingEvent event = null;
@@ -1461,7 +1462,6 @@ public class StandardSession implements HttpSession, Session, Serializable {
}
// Notify interested application event listeners
- Context context = manager.getContext();
Object listeners[] = context.getApplicationEventListeners();
if (listeners == null) {
return;
diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index af0374c..cfb5d32 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -66,7 +66,7 @@ public class ConnectorStoreAppender extends StoreAppender {
throws Exception {
// Render a className attribute if requested
- if (include && desc != null && !desc.isStandard()) {
+ if (include && !desc.isStandard()) {
writer.print(" className=\"");
writer.print(bean.getClass().getName());
writer.print("\"");
diff --git a/java/org/apache/catalina/storeconfig/StoreAppender.java b/java/org/apache/catalina/storeconfig/StoreAppender.java
index eb33bee..006886e 100644
--- a/java/org/apache/catalina/storeconfig/StoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/StoreAppender.java
@@ -214,7 +214,7 @@ public class StoreAppender {
throws Exception {
// Render a className attribute if requested
- if (include && desc != null && !desc.isStandard()) {
+ if (include && !desc.isStandard()) {
writer.print(" className=\"");
writer.print(bean.getClass().getName());
writer.print("\"");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] 02/02: Silence false positive IDE warning
Posted by Rémy Maucherat <re...@apache.org>.
On Sat, May 18, 2019 at 5:03 PM <ma...@apache.org> wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
> commit 99e36dc2c38518f7eeef2295852836aa88df5f1e
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Sat May 18 16:02:48 2019 +0100
>
> Silence false positive IDE warning
>
Indeed. I thought about improving this further, but it works fine and
nobody is actually going to use it, so it will stay as is.
Rémy
> ---
> java/org/apache/tomcat/util/net/AprEndpoint.java | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java
> b/java/org/apache/tomcat/util/net/AprEndpoint.java
> index d61febc..f5fa038 100644
> --- a/java/org/apache/tomcat/util/net/AprEndpoint.java
> +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
> @@ -2814,6 +2814,7 @@ public class AprEndpoint extends
> AbstractEndpoint<Long,Long> implements SNICallB
> nBytes = flushBytes;
> flushBytes = 0;
> } else {
> + @SuppressWarnings("null") // Not
> possible
> int remaining =
> buffer.remaining();
> write(block ==
> BlockingMode.BLOCK, buffer);
> nBytes = remaining -
> buffer.remaining();
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
[tomcat] 02/02: Silence false positive IDE warning
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 99e36dc2c38518f7eeef2295852836aa88df5f1e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat May 18 16:02:48 2019 +0100
Silence false positive IDE warning
---
java/org/apache/tomcat/util/net/AprEndpoint.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java
index d61febc..f5fa038 100644
--- a/java/org/apache/tomcat/util/net/AprEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AprEndpoint.java
@@ -2814,6 +2814,7 @@ public class AprEndpoint extends AbstractEndpoint<Long,Long> implements SNICallB
nBytes = flushBytes;
flushBytes = 0;
} else {
+ @SuppressWarnings("null") // Not possible
int remaining = buffer.remaining();
write(block == BlockingMode.BLOCK, buffer);
nBytes = remaining - buffer.remaining();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org