Author: markt
Date: Mon Nov 30 15:21:13 2015
New Revision: 1717274
URL: http://svn.apache.org/viewvc?rev=1717274&view=rev
Log:
Back-port some refactoring that simplifies the code and is required for some
unit tests planned for back-porting.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java?rev=1717274&r1=1717273&r2=1717274&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/connector/Request.java Mon
Nov 30 15:21:13 2015
@@ -2969,6 +2969,7 @@ public class Request
protected Session doGetSession(boolean create) {
// There cannot be a session if no context has been assigned yet
+ Context context = getContext();
if (context == null) {
return (null);
}
@@ -2982,13 +2983,9 @@ public class Request
}
// Return the requested session if it exists and is valid
- Manager manager = null;
- if (context != null) {
- manager = context.getManager();
- }
- if (manager == null)
- {
- return (null); // Sessions are not supported
+ Manager manager = context.getManager();
+ if (manager == null) {
+ return null; // Sessions are not supported
}
if (requestedSessionId != null) {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
