test/jdk/tools/jlink/plugins/CDSPluginTest.java

@@ -1,7 +1,7 @@
  /*
-  * Copyright (c) 2021, 2026, Oracle and/or its affiliates. All rights reserved.
+  * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

@@ -75,17 +75,19 @@
              subDir = "lib" + sep;
          }
          subDir += "server" + sep;
  
          WhiteBox wb = WhiteBox.getWhiteBox();
-         boolean NOCOMPACT_HEADERS = Platform.is64bit() &&
-                                   !wb.getBooleanVMFlag("UseCompactObjectHeaders");
-         String suffix = NOCOMPACT_HEADERS ? "_nocoh.jsa" : ".jsa";
+         boolean COMPACT_HEADERS = Platform.is64bit() &&
+                                   wb.getBooleanVMFlag("UseCompactObjectHeaders") &&
+                                   wb.isDefaultVMFlag("UseCompactObjectHeaders");
+ 
+         String suffix = COMPACT_HEADERS ? "_coh.jsa" : ".jsa";
  
          if (Platform.isAArch64() || Platform.isX64()) {
              helper.checkImage(image, module, null, null,
-                       new String[] { subDir + "classes" + suffix, subDir + "classes_nocoops" + suffix});
+                       new String[] { subDir + "classes" + suffix, subDir + "classes_nocoops" + suffix });
          } else {
              helper.checkImage(image, module, null, null,
                        new String[] { subDir + "classes" + suffix });
          }
      }