Bug 36796618 - [36776743->24.03.1] Fix stream corruption error on rolling upgrade from 23.09 to any CE version

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v24.03/": change = 110020]

Author: tmiddleton

prj/coherence-core-components/src/main/java/com/tangosol/coherence/component/net/management/model/localModel/StorageManagerModel.java

@@ -736,10 +736,9 @@ public void readExternal(java.io.DataInput in)
             }
 
         // added in 14.1.2.0.0 / 26.06.7 / 23.09.1
-        if ((ExternalizableHelper.isVersionCompatible(in, VersionHelper.VERSION_14_1_2_0)
-            && !ExternalizableHelper.isVersionCompatible(in, VersionHelper.VERSION_23_09))  // exclude reading from 23.09 as it doesn't contain the attribute
-            || ExternalizableHelper.isPatchCompatible(in, VersionHelper.VERSION_14_1_1_2206_7)
-            || ExternalizableHelper.isPatchCompatible(in, VersionHelper.VERSION_23_09_1))
+        if (ExternalizableHelper.isVersionCompatible(in, VersionHelper.VERSION_23_09_1)
+            || ExternalizableHelper.isPatchCompatible(in, VersionHelper.VERSION_14_1_2_0)
+            || ExternalizableHelper.isPatchCompatible(in, VersionHelper.VERSION_14_1_1_2206_7))
             {
             mapSnapshot.put("ClearCount", ExternalizableHelper.readLong(in));
             }
@@ -935,10 +934,9 @@ public void writeExternal(java.io.DataOutput out)
             }
 
         // added in 14.1.2.0.0 / 22.06.7 / 23.09.1
-        if ((ExternalizableHelper.isVersionCompatible(out, VersionHelper.VERSION_14_1_2_0)
-            && !ExternalizableHelper.isVersionCompatible(out, VersionHelper.VERSION_23_09))  // exclude writing to 23.09 as it doesn't contain the attribute
-            || ExternalizableHelper.isPatchCompatible(out, VersionHelper.VERSION_14_1_1_2206_7)
-            || ExternalizableHelper.isPatchCompatible(out, VersionHelper.VERSION_23_09_1))
+        if (ExternalizableHelper.isVersionCompatible(out, VersionHelper.VERSION_23_09_1)
+            || ExternalizableHelper.isPatchCompatible(out, VersionHelper.VERSION_14_1_2_0)
+            || ExternalizableHelper.isPatchCompatible(out, VersionHelper.VERSION_14_1_1_2206_7))
             {
             ExternalizableHelper.writeLong(out, getClearCount());
             }

prj/coherence-core/src/main/java/com/tangosol/internal/util/DistributedAsyncNamedCache.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -31,6 +31,7 @@
 import java.util.function.IntPredicate;
 
 import static com.tangosol.internal.util.VersionHelper.VERSION_14_1_1_2206_6;
+import static com.tangosol.internal.util.VersionHelper.VERSION_14_1_2_0;
 import static com.tangosol.internal.util.VersionHelper.VERSION_23_09;
 import static com.tangosol.internal.util.VersionHelper.isPatchCompatible;
 import static com.tangosol.internal.util.VersionHelper.isVersionCompatible;
@@ -277,8 +278,9 @@ protected boolean isBinaryProcessorCompatible()
      */
     protected static boolean isBinaryProcessorCompatible(int nVersion)
         {
-        // >= 23.09.0 or >= 14.1.1.2206.6 ok
+        // >= 23.09.0 or >= 14.1.1.2206.6 or >= 14.1.2
         return isVersionCompatible(VERSION_23_09, nVersion)
+                || isPatchCompatible(VERSION_14_1_2_0, nVersion)
                 || isPatchCompatible(VERSION_14_1_1_2206_6, nVersion);
         }
 

prj/coherence-core/src/main/java/com/tangosol/internal/util/VersionHelper.java

@@ -84,6 +84,10 @@ public static int getVersionPrefix(int nYear, int nMonth)
             {
             return encodeVersion(15, 0, 0, 0, 0);
             }
+        else if (nYear == 23)
+            {
+            return encodeVersion(14, 1, 2, 0, 0);
+            }
         return encodeVersion(14, 1, 1, 0, 0);
         }
 

prj/test/unit/coherence-core-tests/src/test/java/com/tangosol/net/memberset/VersioningTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -95,7 +95,7 @@ public void testCOH26149()
 
         // if year is 23 or greater, then 03 will be encoded
         nFeaturePack = ServiceMemberSet.encodeVersion(23, 3, 0);
-        assertThat(toVersionString(nFeaturePack), is("14.1.1.2303.0"));
+        assertThat(toVersionString(nFeaturePack), is("14.1.2.2303.0"));
 
         // if year is 21 or less 06 and 12 will be encoded
         nFeaturePack = ServiceMemberSet.encodeVersion(21, 12, 0);