From c60d176acdb2ae4927e8231e3024d1b4e7acff86 Mon Sep 17 00:00:00 2001 From: Jason Feng Date: Wed, 11 Sep 2024 17:37:09 -0400 Subject: [PATCH] CRIU adds @NotCheckpointSafe for ZipFile.getEntry(String) Signed-off-by: Jason Feng --- closed/GensrcJ9JCL.gmk | 1 + .../share/classes/java/util/zip/ZipFile.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/closed/GensrcJ9JCL.gmk b/closed/GensrcJ9JCL.gmk index 60156268f7d..2c8ced4127c 100644 --- a/closed/GensrcJ9JCL.gmk +++ b/closed/GensrcJ9JCL.gmk @@ -48,6 +48,7 @@ $(eval $(call SetupCopyFiles,COPY_OVERLAY_FILES, \ src/java.base/share/classes/java/util/Timer.java \ src/java.base/share/classes/java/util/TimerTask.java \ src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java \ + src/java.base/share/classes/java/util/zip/ZipFile.java \ src/java.base/share/classes/jdk/internal/access/JavaNetInetAddressAccess.java \ src/java.base/share/classes/jdk/internal/ref/PhantomCleanable.java \ src/java.base/share/classes/module-info.java \ diff --git a/src/java.base/share/classes/java/util/zip/ZipFile.java b/src/java.base/share/classes/java/util/zip/ZipFile.java index 02946e885d6..bdf48d3955a 100644 --- a/src/java.base/share/classes/java/util/zip/ZipFile.java +++ b/src/java.base/share/classes/java/util/zip/ZipFile.java @@ -23,6 +23,12 @@ * questions. */ +/* + * =========================================================================== + * (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved + * =========================================================================== + */ + package java.util.zip; import java.io.Closeable; @@ -75,6 +81,10 @@ import static java.util.zip.ZipConstants64.*; import static java.util.zip.ZipUtils.*; +/*[IF CRIU_SUPPORT]*/ +import openj9.internal.criu.NotCheckpointSafe; +/*[ENDIF] CRIU_SUPPORT */ + /** * This class is used to read entries from a zip file. * @@ -331,6 +341,9 @@ public String getComment() { * @return the zip file entry, or null if not found * @throws IllegalStateException if the zip file has been closed */ + /*[IF CRIU_SUPPORT]*/ + @NotCheckpointSafe + /*[ENDIF] CRIU_SUPPORT */ public ZipEntry getEntry(String name) { Objects.requireNonNull(name, "name"); ZipEntry entry = null;