Backport d230b30353f59135287436b09949b80e9fd73a93

amosshi · Jun 19, 2024 · 8b9fa2d · 8b9fa2d
1 parent e716aae
commit 8b9fa2d
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java b/test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -101,15 +101,12 @@ public void isMultiReleaseJar() throws Exception {
         testCustomMultiReleaseValue("true", true);
         testCustomMultiReleaseValue("true\r\nOther: value", true);
         testCustomMultiReleaseValue("true\nOther: value", true);
-        // JDK-8200530: '\r' support in Manifest/Attributes will be addressed separately
-        // testCustomMultiReleaseValue("true\rOther: value", true);
+        testCustomMultiReleaseValue("true\rOther: value", true);
 
         testCustomMultiReleaseValue("false", false);
         testCustomMultiReleaseValue(" true", false);
         testCustomMultiReleaseValue("true ", false);
         testCustomMultiReleaseValue("true\n true", false);
-
-        // JDK-8200530: '\r' support in Manifest/Attributes will be addressed separately
         testCustomMultiReleaseValue("true\r true", false);
         testCustomMultiReleaseValue("true\r\n true", false);