stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8253832: CharsetDecoder : decode() mentioning CoderMalfunctionError behavior not as per spec

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Naoto Sato 2020-10-06 12:35:52 +00:00
parent f397b60ae1
commit a34f48bcf5
3 changed files with 98 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, 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
@ -583,9 +583,7 @@ public abstract class Charset$Coder$ {
CoderResult cr;
try {
cr = $code$Loop(in, out);
} catch (BufferUnderflowException x) {
throw new CoderMalfunctionError(x);
} catch (BufferOverflowException x) {
} catch (RuntimeException x) {
throw new CoderMalfunctionError(x);
}

48
test/jdk/java/nio/charset/CharsetDecoder/CoderMalfunctionErrorTest.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2020, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8253832
* @run testng CoderMalfunctionErrorTest
* @summary Check CoderMalfunctionError is thrown for any RuntimeException
* on CharsetDecoder.decodeLoop() invocation.
*/
import org.testng.annotations.Test;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.*;
@Test
public class CoderMalfunctionErrorTest {
@Test (expectedExceptions = CoderMalfunctionError.class)
public void testDecodeLoop() {
new CharsetDecoder(StandardCharsets.US_ASCII, 1, 1) {
@Override
protected CoderResult decodeLoop(ByteBuffer byteBuffer, CharBuffer charBuffer) {
throw new RuntimeException("This exception should be wrapped in CoderMalfunctionError");
}
}.decode(null, null, true);
}
}

48
test/jdk/java/nio/charset/CharsetEncoder/CoderMalfunctionErrorTest.java Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) 2020, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 8253832
* @run testng CoderMalfunctionErrorTest
* @summary Check CoderMalfunctionError is thrown for any RuntimeException
* on CharsetEncoder.encodeLoop() invocation.
*/
import org.testng.annotations.Test;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.*;
@Test
public class CoderMalfunctionErrorTest {
@Test (expectedExceptions = CoderMalfunctionError.class)
public void testEncodeLoop() {
new CharsetEncoder(StandardCharsets.US_ASCII, 1, 1) {
@Override
protected CoderResult encodeLoop(CharBuffer charBuffer, ByteBuffer byteBuffer) {
throw new RuntimeException("This exception should be wrapped in CoderMalfunctionError");
}
}.encode(null, null, true);
}
}