Skip to content

Commit dec37b2

Browse files
committed
Bug 37213018 - [37193693->14.1.2.0.1] Unable to redefine cache mapping using cache config override (14.1.2.0 cl 112514 --> ce/14.1.2.0)
- partial integ; test updates not integrated (the updated test requires Elastic Data support) [git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v14.1.2.0/": change = 113152]
1 parent d7adec1 commit dec37b2

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

prj/coherence-core/src/main/java/com/tangosol/coherence/config/xml/processor/CacheConfigOverrideProcessor.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Copyright (c) 2022, Oracle and/or its affiliates.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.tangosol.coherence.config.xml.processor;
88

@@ -11,6 +11,7 @@
1111
import java.util.ArrayList;
1212
import java.util.List;
1313

14+
import com.oracle.coherence.common.base.Logger;
1415
import com.tangosol.config.xml.OverrideProcessor;
1516
import com.tangosol.run.xml.XmlElement;
1617
import com.tangosol.run.xml.XmlHelper;
@@ -116,10 +117,13 @@ private void processSchemeMappings(XmlElement xmlBase,
116117
if (sCacheNameOverride.equals(sCacheNameBase))
117118
{
118119
XmlHelper.overrideElement(xmlElementBase, xmlElementOverride);
119-
}
120-
else if (!listElements.contains(xmlElementOverride))
121-
{
122-
listElements.add(xmlElementOverride);
120+
121+
if (listElements.contains(xmlElementOverride))
122+
{
123+
listElements.remove(xmlElementOverride);
124+
}
125+
126+
break;
123127
}
124128
else if (sSchemeName.equals(sOverrideSchemeName))
125129
{

0 commit comments

Comments
 (0)