Merge pull request #34 from tadamski/jdk21-enum-parsing

IIOPInputStream: fix java.lang.Enum parsing after JDK21 hash field wa…
jboss · Jan 22, 2025 · dc31eb8 · dc31eb8
2 parents 9d95b3c + 0bf218f
commit dc31eb8
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
@@ -940,7 +940,14 @@ private synchronized Object inputObject(Class clz,
              *  Handle it as a serializable class.
              */
             if (Enum.class.isAssignableFrom( clz )) {
-                int ordinal = orbStream.read_long() ;
+                /**
+                 * Fields of java.lang.enum.class have changed (hash field has been added)
+                 * in JDK21 leading to IIOP stream parsing errors (see WFLY-20283).
+                 */
+                if (Enum.class.getDeclaredFields().length >= 3) {
+                    int hash = orbStream.read_long();
+                }
+                int ordinal = orbStream.read_long();
                 String value = (String)orbStream.read_value( String.class ) ;
                 return Enum.valueOf( clz, value ) ;
             } else if (currentClassDesc.isExternalizable()) {