commit 7a78d4c83736ab10fc84a7c751340c1f3f240632
author Jacques Le Roux <jacques.le.roux@les7arts.com> Tue Apr 21 15:49:00 2020 +0200
committer Jacques Le Roux <jacques.le.roux@les7arts.com> Tue Oct 26 08:02:00 2021 +0200
tree adf5f05b74d92f3133315af830ec6d3aad7046c2
parent 5ddb2b267f8f2ec617b94c1575d9792a2155dbd6

Improved: Update build.gradle to the latest dependencies

(OFBIZ-11603)

Replaces deprecated calls

Conflicts handled by hand CrossSubdomainSessionValve.java

framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java

diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
index aa1115f..8f56246 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java
@@ -50,7 +50,6 @@
 import org.apache.catalina.ha.ClusterManager;
 import org.apache.catalina.ha.tcp.ReplicationValve;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
-import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.ContextConfig;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.tribes.group.GroupChannel;
@@ -505,7 +504,7 @@
         context.addLifecycleListener(new ContextConfig());
         context.setJ2EEApplication("OFBiz");
         context.setJ2EEServer("OFBiz Container");
-        context.setLoader(new WebappLoader(Thread.currentThread().getContextClassLoader()));
+        context.setParentClassLoader(Thread.currentThread().getContextClassLoader());
         context.setDocBase(location);
         context.setReloadable(ContainerConfig.getPropertyValue(configuration, "apps-context-reloadable", false));
         context.setDistributable(contextIsDistributable);

framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java

diff --git a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
index 8493fc0..8d19fed 100644
--- a/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
+++ b/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java
@@ -115,7 +115,7 @@
                 if (mimeHeaders.getName(i).equals("Set-Cookie")) {
                     MessageBytes value = mimeHeaders.getValue(i);
                     if (value.indexOf(cookie.getName()) >= 0) {
-                        String newCookieValue = request.getContext().getCookieProcessor().generateHeader(newCookie);
+                        String newCookieValue = request.getContext().getCookieProcessor().generateHeader(newCookie, request);
                         if (Debug.verboseOn()) Debug.logVerbose("CrossSubdomainSessionValve: old Set-Cookie value: " + value.toString(), module);
                         if (Debug.verboseOn()) Debug.logVerbose("CrossSubdomainSessionValve: new Set-Cookie value: " + newCookieValue, module);
                         value.setString(newCookieValue);