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:25 UTC
[tomcat] 01/02: Refactor to avoid unnecessary null checks.
Identified by Coverity Scan.
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