You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2021/10/26 06:03:08 UTC
[ofbiz-framework] branch release18.12 updated: Improved: Update
build.gradle to the latest dependencies
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/release18.12 by this push:
new 7a78d4c Improved: Update build.gradle to the latest dependencies
7a78d4c is described below
commit 7a78d4c83736ab10fc84a7c751340c1f3f240632
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Tue Apr 21 15:49:00 2020 +0200
Improved: Update build.gradle to the latest dependencies
(OFBIZ-11603)
Replaces deprecated calls
Conflicts handled by hand CrossSubdomainSessionValve.java
---
.../java/org/apache/ofbiz/catalina/container/CatalinaContainer.java | 3 +--
.../apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
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.filters.RequestDumperFilter;
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 @@ public class CatalinaContainer implements Container {
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);
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 @@ public class CrossSubdomainSessionValve extends ValveBase {
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);