8339126: JNI exception pending in Inflater.c

Justin Lu · Justin Lu · commit a8ac28725bfc · 2024-08-28T21:14:29.000Z
Reviewed-by: lancea, vtewari, jpai, naoto
diff --git a/src/java.base/share/native/libzip/Inflater.c b/src/java.base/share/native/libzip/Inflater.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -49,8 +49,8 @@ JNIEXPORT void JNICALL
 Java_java_util_zip_Inflater_initIDs(JNIEnv *env, jclass cls)
 {
     inputConsumedID = (*env)->GetFieldID(env, cls, "inputConsumed", "I");
-    outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
     CHECK_NULL(inputConsumedID);
+    outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");
     CHECK_NULL(outputConsumedID);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* This code is free software; you can redistribute it and/or modify it`
`@@ -49,8 +49,8 @@ JNIEXPORT void JNICALL`
`49`	`49`	`Java_java_util_zip_Inflater_initIDs(JNIEnv *env, jclass cls)`
`50`	`50`	`{`
`51`	`51`	`inputConsumedID = (*env)->GetFieldID(env, cls, "inputConsumed", "I");`
`52`		`- outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");`
`53`	`52`	`CHECK_NULL(inputConsumedID);`
	`53`	`+ outputConsumedID = (*env)->GetFieldID(env, cls, "outputConsumed", "I");`
`54`	`54`	`CHECK_NULL(outputConsumedID);`
`55`	`55`	`}`
`56`	`56`