svn commit: r1727987 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Author: jleroux
Date: Mon Feb  1 18:30:43 2016
New Revision: 1727987

URL: http://svn.apache.org/viewvc?rev=1727987&view=rev
Log:
Removes the forceManualJsessionid feature - https://issues.apache.org/jira/browse/OFBIZ-6867

This follows Scott's comment at https://issues.apache.org/jira/browse/OFBIZ-6111?focusedCommentId=15076677

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=1727987&r1=1727986&r2=1727987&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Mon Feb  1 18:30:43 2016
@@ -1230,7 +1230,6 @@ public class RequestHandler {
 
         String encodedUrl;
         if (encode) {
-            boolean forceManualJsessionid = !cookies;
             boolean isSpider = false;
 
             // if the current request comes from a spider, we will not add the jsessionid to the link
@@ -1238,17 +1237,7 @@ public class RequestHandler {
                 isSpider = true;
             }
 
-            // if this isn't a secure page, but we made a secure URL, make sure we manually add the jsessionid since the response.encodeURL won't do that
-            if (!request.isSecure() && didFullSecure) {
-                forceManualJsessionid = true;
-            }
-
-            // if this is a secure page, but we made a standard URL, make sure we manually add the jsessionid since the response.encodeURL won't do that
-            if (request.isSecure() && didFullStandard) {
-                forceManualJsessionid = true;
-            }
-
-            if (response != null && !forceManualJsessionid && !isSpider) {
+            if (response != null && !isSpider) {
                 encodedUrl = response.encodeURL(newURL.toString());
             } else {
                 if (!isSpider) {