diff --git a/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java b/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java index fda7a561e87..d242cb8ed42 100644 --- a/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java +++ b/make/jdk/src/classes/build/tools/generatecharacter/CharacterScript.java @@ -115,7 +115,7 @@ public class CharacterScript { for (j = 0; j < scriptSize; j++) { for (int cp = scripts[j][0]; cp <= scripts[j][1]; cp++) { - String name = names[scripts[j][2]].toUpperCase(Locale.ENGLISH);; + String name = names[scripts[j][2]].toUpperCase(Locale.ENGLISH); if (cp > 0xffff) System.out.printf("%05X %s%n", cp, name); else diff --git a/make/langtools/tools/genstubs/GenStubs.java b/make/langtools/tools/genstubs/GenStubs.java index 9f8fc7a7a59..bcf73fc5f71 100644 --- a/make/langtools/tools/genstubs/GenStubs.java +++ b/make/langtools/tools/genstubs/GenStubs.java @@ -213,7 +213,7 @@ public class GenStubs { long prevClassMods = currClassMods; currClassMods = tree.mods.flags; try { - super.visitClassDef(tree);; + super.visitClassDef(tree); } finally { currClassMods = prevClassMods; } diff --git a/src/java.base/share/classes/java/io/File.java b/src/java.base/share/classes/java/io/File.java index 3f7cd86cf70..f279ee56bf5 100644 --- a/src/java.base/share/classes/java/io/File.java +++ b/src/java.base/share/classes/java/io/File.java @@ -2012,7 +2012,7 @@ public class File int prefixLength = prefix.length(); int nusLength = nus.length(); - int suffixLength = suffix.length();; + int suffixLength = suffix.length(); String name; int nameMax = fs.getNameMax(dir.getPath()); diff --git a/src/java.base/share/classes/java/util/WeakHashMap.java b/src/java.base/share/classes/java/util/WeakHashMap.java index 03aee09e992..d74c7d65728 100644 --- a/src/java.base/share/classes/java/util/WeakHashMap.java +++ b/src/java.base/share/classes/java/util/WeakHashMap.java @@ -1040,7 +1040,7 @@ public class WeakHashMap Objects.requireNonNull(function); int expectedModCount = modCount; - Entry[] tab = getTable();; + Entry[] tab = getTable(); for (Entry entry : tab) { while (entry != null) { Object key = entry.get(); diff --git a/src/java.base/share/classes/sun/util/logging/PlatformLogger.java b/src/java.base/share/classes/sun/util/logging/PlatformLogger.java index 07c6878c151..db85d9c317b 100644 --- a/src/java.base/share/classes/sun/util/logging/PlatformLogger.java +++ b/src/java.base/share/classes/sun/util/logging/PlatformLogger.java @@ -371,7 +371,7 @@ public class PlatformLogger { @Deprecated public void setLevel(Level newLevel) { final ConfigurableBridge.LoggerConfiguration spi = - PlatformLogger.ConfigurableBridge.getLoggerConfiguration(loggerProxy);; + PlatformLogger.ConfigurableBridge.getLoggerConfiguration(loggerProxy); if (spi != null) { spi.setPlatformLevel(newLevel); } diff --git a/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/src/java.desktop/share/classes/javax/swing/RepaintManager.java index fe414fc16af..3831a66a01c 100644 --- a/src/java.desktop/share/classes/javax/swing/RepaintManager.java +++ b/src/java.desktop/share/classes/javax/swing/RepaintManager.java @@ -966,7 +966,7 @@ public class RepaintManager tmp.setBounds(dirtyComponents.get(dirtyComponent)); // System.out.println("Collect dirty component for bound " + tmp + - // "component bounds is " + cBounds);; + // "component bounds is " + cBounds); SwingUtilities.computeIntersection(0,0,w,h,tmp); if (tmp.isEmpty()) { diff --git a/src/java.rmi/share/classes/java/rmi/server/LogStream.java b/src/java.rmi/share/classes/java/rmi/server/LogStream.java index 7d501ffb4af..ca554569d3b 100644 --- a/src/java.rmi/share/classes/java/rmi/server/LogStream.java +++ b/src/java.rmi/share/classes/java/rmi/server/LogStream.java @@ -176,7 +176,7 @@ public class LogStream extends PrintStream { synchronized (this) { synchronized (logOut) { // construct prefix for log messages: - buffer.setLength(0);; + buffer.setLength(0); buffer.append( // date/time stamp... (new Date()).toString()); buffer.append(':'); diff --git a/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java index 695268735a9..d9cd765d12e 100644 --- a/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java +++ b/src/java.security.jgss/share/classes/sun/security/krb5/internal/rcache/AuthTime.java @@ -134,8 +134,8 @@ public class AuthTime { * Encodes to be used in a dfl file */ protected byte[] encode0(String cstring, String sstring) { - byte[] c = cstring.getBytes(StandardCharsets.UTF_8);; - byte[] s = sstring.getBytes(StandardCharsets.UTF_8);; + byte[] c = cstring.getBytes(StandardCharsets.UTF_8); + byte[] s = sstring.getBytes(StandardCharsets.UTF_8); byte[] zero = new byte[1]; int len = 4 + c.length + 1 + 4 + s.length + 1 + 4 + 4; ByteBuffer bb = ByteBuffer.allocate(len) diff --git a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java index a588c1dd94a..21b9614d746 100644 --- a/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java +++ b/src/java.sql.rowset/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java @@ -276,7 +276,7 @@ public class CachedRowSetWriter implements TransactionalWriter, Serializable { // We assume caller is a CachedRowSet CachedRowSetImpl crs = (CachedRowSetImpl)caller; // crsResolve = new CachedRowSetImpl(); - this.crsResolve = new CachedRowSetImpl();; + this.crsResolve = new CachedRowSetImpl(); // The reader is registered with the writer at design time. // This is not required, in general. The reader has logic diff --git a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java index 136fff08d2a..1affa2634ec 100644 --- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java +++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java @@ -535,7 +535,7 @@ public class SQLOutputImpl implements SQLOutput { */ @SuppressWarnings("unchecked") public void writeStruct(Struct x) throws SQLException { - SerialStruct s = new SerialStruct(x,map);; + SerialStruct s = new SerialStruct(x,map); attribs.add(s); } diff --git a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java index ab12a274a46..e0259cb8c3f 100644 --- a/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java +++ b/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java @@ -1011,7 +1011,7 @@ public class XPathParser extends lr_parser { if (axis == Axis.NAMESPACE) { nodeType = (name.toString().equals("*")) ? -1 - : _xsltc.registerNamespacePrefix(name);; + : _xsltc.registerNamespacePrefix(name); } else { final String uri = name.getNamespace(); final String local = name.getLocalPart(); diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java index 594bb4e95b4..9dd94f74252 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java @@ -493,7 +493,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea } private class NameServiceIterator extends ServiceIterator { - private Map namedProcessorsMap = new HashMap<>();; + private Map namedProcessorsMap = new HashMap<>(); private Iterator processorNames = null; private Processor nextProc = null; diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java index 5f129b51a96..8e1c005d6a1 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/gc/z/ZGlobals.java @@ -78,7 +78,7 @@ public class ZGlobals { ZPageSizeMediumShift = db.lookupLongConstant("ZPageSizeMediumShift").longValue(); ZObjectAlignmentMediumShift = db.lookupIntConstant("ZObjectAlignmentMediumShift").intValue(); - ZObjectAlignmentLargeShift = db.lookupIntConstant("ZObjectAlignmentLargeShift").intValue();; + ZObjectAlignmentLargeShift = db.lookupIntConstant("ZObjectAlignmentLargeShift").intValue(); ZAddressOffsetShift = db.lookupLongConstant("ZAddressOffsetShift").longValue(); diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java index 21619b1f5ae..c83d7912650 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java @@ -79,7 +79,7 @@ public class FindInCodeCachePanel extends SAPanel { } begin = begin.addOffsetTo(addressSize); } - iterated = end.minus(base);; + iterated = end.minus(base); updateProgressBar(null); } diff --git a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java index ced929dea16..c9808063ad3 100644 --- a/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java +++ b/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java @@ -195,7 +195,7 @@ public class FindInHeapPanel extends JPanel { for (String update : updates) { textArea.append(update); } - updates = new ArrayList<>();; + updates = new ArrayList<>(); } pendingUpdate = false; } diff --git a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java index 5d591705d52..707cb831540 100644 --- a/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java +++ b/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TypeAnnotation.java @@ -130,7 +130,7 @@ public class TypeAnnotation { break; // class extends or implements clause case CLASS_EXTENDS: - position.type_index = cr.readUnsignedShort();; + position.type_index = cr.readUnsignedShort(); break; // throws case THROWS: diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java index 6d353112dff..a83fabfbaa8 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/instrument/SocketChannelImplInstrumentor.java @@ -52,7 +52,7 @@ final class SocketChannelImplInstrumentor { int bytesRead = 0; long start = 0; try { - start = EventHandler.timestamp();; + start = EventHandler.timestamp(); bytesRead = read(dst); } finally { long duration = EventHandler.timestamp() - start; diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java index cbf508306d5..3be2dd6c199 100644 --- a/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java +++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/tool/JSONWriter.java @@ -63,7 +63,7 @@ final class JSONWriter extends EventPrintWriter { @Override protected void printEnd() { - printArrayEnd();; + printArrayEnd(); printObjectEnd(); printObjectEnd(); } diff --git a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java index 9d540847148..aec5116bb2e 100644 --- a/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java +++ b/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Selector.java @@ -302,7 +302,7 @@ class Selector { & SelectorInstanceWithDoc> SelectorKind(Class k) { - this.all = EnumSet.allOf(FormatCase.class);; + this.all = EnumSet.allOf(FormatCase.class); this.k = k; } } diff --git a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java index b0fc682f65a..05407f8c969 100644 --- a/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java +++ b/src/utils/LogCompilation/src/main/java/com/sun/hotspot/tools/compiler/LogParser.java @@ -973,7 +973,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler { m.setHolder(type(search(atts, "holder"))); m.setName(search(atts, "name")); m.setReturnType(type(search(atts, "return"))); - String arguments = atts.getValue("arguments");; + String arguments = atts.getValue("arguments"); if (arguments == null) { m.setSignature("()" + sigtype(atts.getValue("return"))); } else { diff --git a/test/hotspot/jtreg/compiler/codegen/Test6909839.java b/test/hotspot/jtreg/compiler/codegen/Test6909839.java index d6fa98d8155..5fcd5ceacee 100644 --- a/test/hotspot/jtreg/compiler/codegen/Test6909839.java +++ b/test/hotspot/jtreg/compiler/codegen/Test6909839.java @@ -241,7 +241,7 @@ public class Test6909839 { static void testp() { Object a = new Object(); - Object b = new Object();; + Object b = new Object(); int total = 0; for (int i = 0 ; i < 10000; i++) { total += ((i % 4 != 0) ? a : b).hashCode(); @@ -251,7 +251,7 @@ public class Test6909839 { static void testup() { Object a = new Object(); - Object b = new Object();; + Object b = new Object(); int total = 0; for (int i = 0 ; i < 10000; i++) { int v = i % 4; @@ -262,7 +262,7 @@ public class Test6909839 { static void testdp() { Object a = new Object(); - Object b = new Object();; + Object b = new Object(); int total = 0; for (int i = 0 ; i < 10000; i++) { int v = i % 4; @@ -272,7 +272,7 @@ public class Test6909839 { } static void testfp() { Object a = new Object(); - Object b = new Object();; + Object b = new Object(); int total = 0; for (int i = 0 ; i < 10000; i++) { int v = i % 4; diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java index e15b151ec06..797bef95edc 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/CompileCodeTestCase.java @@ -244,7 +244,7 @@ public class CompileCodeTestCase { } static { - Map, Object> map = new HashMap<>();; + Map, Object> map = new HashMap<>(); map.put(CompileCodeTestCase.DummyEx.class, new CompileCodeTestCase.DummyEx()); map.put(CompileCodeTestCase.Dummy.class, diff --git a/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java b/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java index 10d766cf122..84752a0ccf0 100644 --- a/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java +++ b/test/hotspot/jtreg/compiler/unsafe/TestMisalignedUnsafeAccess.java @@ -37,7 +37,7 @@ import jdk.test.lib.Asserts; public class TestMisalignedUnsafeAccess { - private static final Unsafe UNSAFE = Unsafe.getUnsafe();; + private static final Unsafe UNSAFE = Unsafe.getUnsafe(); private static short onHeapStaticMemory; // For static field testing private static final Object onHeapStaticMemoryBase; diff --git a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java index 959d43173d0..55c10299ed6 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/TestCommon.java @@ -466,7 +466,7 @@ public class TestCommon extends CDSTestUtils { public static Result runWithoutCDS(String... suffix) throws Exception { AppCDSOptions opts = (new AppCDSOptions()); - opts.addSuffix(suffix).setXShareMode("off");; + opts.addSuffix(suffix).setXShareMode("off"); return new Result(opts, runWithArchive(opts)); } diff --git a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java index 72d62c64179..2aeb2d41559 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/customLoader/SameNameInTwoLoadersTest.java @@ -54,7 +54,7 @@ public class SameNameInTwoLoadersTest { customJar = JarBuilder.build("SameNameInTwoLoadersTest_custom", "CustomLoadee", "CustomLoadee3"); useWbParam = "-Xbootclasspath/a:" + - JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox");; + JarBuilder.build(true, "WhiteBox", "sun/hotspot/WhiteBox"); // ====== unrelated loaders executeTestCase(getClassList_FP(), diff --git a/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java b/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java index 03e388df6c3..6b835ca7ac8 100644 --- a/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java +++ b/test/hotspot/jtreg/serviceability/jvmti/Heap/IterateHeapWithEscapeAnalysisEnabled.java @@ -590,7 +590,7 @@ public class IterateHeapWithEscapeAnalysisEnabled { // The new instance is an ArgEscape instance and escapes to the JVMTI agent // while the target thread is in the call to dontinline_endlessLoop(). At this // location there is no local variable that references the ArgEscape. - ((ABBox) dontinline_endlessLoop(new ABBox(this))).synchronizedSlowInc();; + ((ABBox) dontinline_endlessLoop(new ABBox(this))).synchronizedSlowInc(); } } diff --git a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java index 3f8a6b3765a..2f0dca67427 100644 --- a/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java +++ b/test/hotspot/jtreg/testlibrary/ctw/src/sun/hotspot/tools/ctw/CtwRunner.java @@ -93,7 +93,7 @@ public class CtwRunner { errors = new ArrayList<>(); if (start.endsWith("%") && stop.endsWith("%")) { - int startPercentage = Integer.parseInt(start.substring(0, start.length() - 1));; + int startPercentage = Integer.parseInt(start.substring(0, start.length() - 1)); int stopPercentage = Integer.parseInt(stop.substring(0, stop.length() - 1)); if (startPercentage < 0 || startPercentage > 100 || stopPercentage < 0 || stopPercentage > 100) { diff --git a/test/hotspot/jtreg/vmTestbase/jit/series/series.java b/test/hotspot/jtreg/vmTestbase/jit/series/series.java index c17e24427f9..eef54c2c81a 100644 --- a/test/hotspot/jtreg/vmTestbase/jit/series/series.java +++ b/test/hotspot/jtreg/vmTestbase/jit/series/series.java @@ -192,7 +192,7 @@ fres); { series patObj = new series(); if (patObj.runit()!=0) - throw new TestFailure("Test failed.");; + throw new TestFailure("Test failed."); series.goldChecker.check(); } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java index 54a90a930f2..9fe8a7e5703 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/unmonitor/unmonitor001/unmonitor001.java @@ -172,7 +172,7 @@ public class unmonitor001 extends JdbTest { private boolean checkCommands(String[] reply) { Paragrep grep; String found; - Vector v = new Vector();; + Vector v = new Vector(); boolean result = true; int count; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java index 4fd48e21ff0..79bb11fc706 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/BScenarios/multithrd/tc02x003.java @@ -146,7 +146,7 @@ public class tc02x003 { hitEvent(clsEvent); mthdReq = evm.createMethodEntryRequest(); - ReferenceType testedClass = clsEvent.referenceType();; + ReferenceType testedClass = clsEvent.referenceType(); mthdReq.addClassFilter(testedClass); mthdReq.enable(); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java index da528cee5b3..46608d9b07d 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ClassObjectReference/reflectedType/reflectype002.java @@ -166,7 +166,7 @@ public class reflectype002 extends Log { print_log_on_verbose ("--> reflectype002: getting ClassObjectReference object for loaded checked class..."); - ClassObjectReference class_obj_ref = refType.classObject();; + ClassObjectReference class_obj_ref = refType.classObject(); print_log_on_verbose("--> reflectype002: getting ClassObjectReference object - DONE!"); print_log_on_verbose diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java index 9d5dba92c75..5593aabe31b 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/LocalVariable/isVisible/isvisible001.java @@ -415,7 +415,7 @@ public class isvisible001 { expresult = returnCode1; } } catch ( IllegalArgumentException e ) { - log3("ERROR: IllegalArgumentException for i3 in stackFrame");; + log3("ERROR: IllegalArgumentException for i3 in stackFrame"); expresult = returnCode1; } } diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java index cc75403caf6..2e361e65cab 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/ThreadReference/frames/frames001.java @@ -373,7 +373,7 @@ public class frames001 { log2(" getting new List of frames"); try { - frameList = thread2.frames();; + frameList = thread2.frames(); } catch ( IndexOutOfBoundsException e1 ) { log3("ERROR: IndexOutOfBoundsException"); expresult = returnCode1; diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java index f872a6dcba3..d9dd4a88c80 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/scenarios/hotswap/HS203/hs203t002/hs203t002.java @@ -79,7 +79,7 @@ public class hs203t002 extends RedefineAgent { Thread.sleep(10000); popThreadFrame(mt); resumeThread(mt); - while(!MyThread.resume2.get());; + while(!MyThread.resume2.get()); Thread.sleep(10000); suspendThread(mt); //mt.suspend(); diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java index d7aa6c30219..a78dabdbe25 100644 --- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java +++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Launcher.java @@ -184,7 +184,7 @@ public class Launcher extends DebugeeBinder { connect.append(argumentHandler.getConnectorName() + ":"); String connectorAddress; - String vmAddress = makeTransportAddress();; + String vmAddress = makeTransportAddress(); if (argumentHandler.isRawLaunchingConnector()) { diff --git a/test/jdk/com/sun/jdi/ConstantPoolInfo.java b/test/jdk/com/sun/jdi/ConstantPoolInfo.java index 097ab535cf2..5d5c2a6a5d9 100644 --- a/test/jdk/com/sun/jdi/ConstantPoolInfo.java +++ b/test/jdk/com/sun/jdi/ConstantPoolInfo.java @@ -241,7 +241,7 @@ public class ConstantPoolInfo extends TestScaffold { if (magic != JAVA_MAGIC) { failure("fatal bad class file format"); } - expectedMinorVersion = in.readShort();; + expectedMinorVersion = in.readShort(); expectedMajorVersion = in.readShort(); expectedCpoolCount = in.readUnsignedShort(); in.close(); diff --git a/test/jdk/com/sun/jdi/GenericsTest.java b/test/jdk/com/sun/jdi/GenericsTest.java index 28a3d69a8d6..f12a5f74322 100644 --- a/test/jdk/com/sun/jdi/GenericsTest.java +++ b/test/jdk/com/sun/jdi/GenericsTest.java @@ -40,7 +40,7 @@ import java.util.*; /********** target program **********/ class GenericsTarg { - static Gen1 genField = new Gen1();; + static Gen1 genField = new Gen1(); static Sub1 sub1Field = new Sub1(); String[] strArray = null; diff --git a/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java index c643aae1f00..0c1734cb1cc 100644 --- a/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java +++ b/test/jdk/java/awt/Component/CompEventOnHiddenComponent/CompEventOnHiddenComponent.java @@ -86,7 +86,7 @@ public class CompEventOnHiddenComponent EventQueue.invokeLater(new Runnable() { public void run() { JFrame parentWindow = new JFrame("JFrame 1"); - JButton component = new JButton("JButton 1");; + JButton component = new JButton("JButton 1"); JButton smallButton = new JButton("Small Button"); diff --git a/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java b/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java index e186e7ac132..535e6c68aa5 100644 --- a/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java +++ b/test/jdk/java/awt/EmbeddedFrame/EmbeddedFrameGrabTest/EmbeddedFrameGrabTest.java @@ -81,7 +81,7 @@ public class EmbeddedFrameGrabTest { = clazz.getConstructor(new Class[]{long.class}); final Frame embedded_frame = (Frame) constructor.newInstance(new Object[]{ - new Long(hwnd)});; + new Long(hwnd)}); final JComboBox combo = new JComboBox<>(new String[]{ "Item 1", "Item 2" }); diff --git a/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java b/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java index 15cf121607c..7e9023b1afc 100644 --- a/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java +++ b/test/jdk/java/awt/PrintJob/PrintArcTest/PrintArcTest.java @@ -65,7 +65,7 @@ public class PrintArcTest extends Panel implements ActionListener { } private Frame getFrame() { - Container cont = getParent();; + Container cont = getParent(); while ( !(cont instanceof Frame ) ) { cont = cont.getParent(); diff --git a/test/jdk/java/awt/SplashScreen/GenerateTestImage.java b/test/jdk/java/awt/SplashScreen/GenerateTestImage.java index 93def334756..ddde69ca295 100644 --- a/test/jdk/java/awt/SplashScreen/GenerateTestImage.java +++ b/test/jdk/java/awt/SplashScreen/GenerateTestImage.java @@ -43,7 +43,7 @@ public class GenerateTestImage { Graphics2D graphics2D = image.createGraphics(); graphics2D.setColor(Color.red); graphics2D.fillOval(0, 0, IMAGE_SIZE, IMAGE_SIZE); - graphics2D.dispose();; + graphics2D.dispose(); ImageIO.write(image, "png", file); } diff --git a/test/jdk/java/awt/print/PrinterJob/PrtException.java b/test/jdk/java/awt/print/PrinterJob/PrtException.java index 152fe70d485..bb590fd6cd9 100644 --- a/test/jdk/java/awt/print/PrinterJob/PrtException.java +++ b/test/jdk/java/awt/print/PrinterJob/PrtException.java @@ -50,7 +50,7 @@ public class PrtException implements Printable { } System.out.println("PrintService found : "+defService); - pj = PrinterJob.getPrinterJob();; + pj = PrinterJob.getPrinterJob(); pj.setPrintService(defService); //pj.setPrintable(this); // commenting this line should not result in PrinterException pj.print(); diff --git a/test/jdk/java/io/File/GetXSpace.java b/test/jdk/java/io/File/GetXSpace.java index ac80bdf68fd..d53b246994e 100644 --- a/test/jdk/java/io/File/GetXSpace.java +++ b/test/jdk/java/io/File/GetXSpace.java @@ -154,7 +154,7 @@ public class GetXSpace { // cygwin's df lists windows path as FileSystem (1st group) name = Platform.isWindows() ? m.group(1) : m.group(4); } - al.add(new Space(m.group(2), m.group(3), name));; + al.add(new Space(m.group(2), m.group(3), name)); } j = m.end(); } else { diff --git a/test/jdk/java/io/File/createTempFile/NameTooLong.java b/test/jdk/java/io/File/createTempFile/NameTooLong.java index 75d604b81e1..fe7bd03f95e 100644 --- a/test/jdk/java/io/File/createTempFile/NameTooLong.java +++ b/test/jdk/java/io/File/createTempFile/NameTooLong.java @@ -54,7 +54,7 @@ public class NameTooLong { if (ps[1].startsWith(".") && !s.contains(ps[1].substring(0, 4))) { System.err.printf("%s did not contain %s%n", s, - ps[1].substring(0, 4));; + ps[1].substring(0, 4)); failures++; } } catch (IOException e) { diff --git a/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java b/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java index cc89709b7e7..7b564bc633a 100644 --- a/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java +++ b/test/jdk/java/io/RandomAccessFile/WriteBytesChars.java @@ -37,7 +37,7 @@ public class WriteBytesChars { byte[] b = new byte[80]; File fn = new File("x.WriteBytesChars"); - RandomAccessFile raf = new RandomAccessFile(fn , "rw");; + RandomAccessFile raf = new RandomAccessFile(fn , "rw"); try { for (int i = 0; i < 80; i++) { buf[i] = 'a'; diff --git a/test/jdk/java/lang/invoke/8022701/BogoLoader.java b/test/jdk/java/lang/invoke/8022701/BogoLoader.java index e8c579a27c8..568ff62089e 100644 --- a/test/jdk/java/lang/invoke/8022701/BogoLoader.java +++ b/test/jdk/java/lang/invoke/8022701/BogoLoader.java @@ -120,7 +120,7 @@ public class BogoLoader extends ClassLoader { if (verbose) { System.err.println("Loading classloader class " + name); } - byte[] classData = getClass(name);; + byte[] classData = getClass(name); boolean expanded = false; if (!noReplace && replaced.containsKey(name)) { if (verbose) { diff --git a/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java b/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java index a129ea254a4..b4d19fe8a05 100644 --- a/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java +++ b/test/jdk/java/lang/invoke/accessProtectedSuper/BogoLoader.java @@ -121,7 +121,7 @@ public class BogoLoader extends ClassLoader { if (verbose) { System.err.println("Loading classloader class " + name); } - byte[] classData = getClass(name);; + byte[] classData = getClass(name); boolean expanded = false; if (!noReplace && replaced.containsKey(name)) { if (verbose) { diff --git a/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java b/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java index 5f6923526ab..ac6de886b25 100644 --- a/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java +++ b/test/jdk/java/lang/management/RuntimeMXBean/GetSystemProperties.java @@ -40,7 +40,7 @@ public class GetSystemProperties { // system properties to be omitted private static final String KEY3 = "test.property.key3"; - private static final Long VALUE3 = new Long(0);; + private static final Long VALUE3 = new Long(0); private static final Object KEY4 = new Object(); private static final String VALUE4 = "test.property.value4"; diff --git a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java index 05d27547a15..60a35a42a06 100644 --- a/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java +++ b/test/jdk/java/net/httpclient/AggregateRequestBodyTest.java @@ -485,7 +485,7 @@ public class AggregateRequestBodyTest implements HttpServerAdapters { subscriber.subscriptionCF.thenAccept(s -> s.request(1)); List result = subscriber.resultCF.join(); assertEquals(result, List.of()); - assertTrue(subscriber.items.isEmpty());; + assertTrue(subscriber.items.isEmpty()); } // verifies that error emitted by upstream publishers are propagated downstream. diff --git a/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java b/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java index 10fdcaaaea6..c715cad8c7c 100644 --- a/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java +++ b/test/jdk/java/nio/channels/SocketChannel/CloseTimeoutChannel.java @@ -102,7 +102,7 @@ public class CloseTimeoutChannel { System.out.println(INDENT+"Listening on port "+ _listener.socket().getLocalPort()); ByteBuffer buf=ByteBuffer.allocate(5); - Socket client=_listener.accept().socket();; + Socket client=_listener.accept().socket(); System.out.println(INDENT+"Accepted client"); OutputStream out=client.getOutputStream(); diff --git a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java index c4a15b28bb1..9a0490beb0f 100644 --- a/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java +++ b/test/jdk/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java @@ -68,7 +68,7 @@ public class DGCImplInsulation implements java.rmi.Remote { new ProtectionDomain( new CodeSource(null, (Certificate[]) null), perms) }); - Remote impl = new DGCImplInsulation();; + Remote impl = new DGCImplInsulation(); try { Remote stub = (Remote) java.security.AccessController.doPrivileged( diff --git a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java index 3f6c17b277a..d44216b69b5 100644 --- a/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java +++ b/test/jdk/java/time/tck/java/time/zone/TCKZoneRules.java @@ -1072,7 +1072,7 @@ public class TCKZoneRules { ); OffsetDateTime before_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).minusSeconds(1); - OffsetDateTime after_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).plusSeconds(1);; + OffsetDateTime after_time_of_stdOffsetTransition1 = OffsetDateTime.of(time_of_stdOffsetTransition1, stdOffset1).plusSeconds(1); assertEquals(zoneRule.getStandardOffset(before_time_of_stdOffsetTransition1.toInstant()), stdOffset1); assertEquals(zoneRule.getStandardOffset(after_time_of_stdOffsetTransition1.toInstant()), stdOffset2); diff --git a/test/jdk/java/util/logging/TestAppletLoggerContext.java b/test/jdk/java/util/logging/TestAppletLoggerContext.java index 6fbe975b5e4..b69497a626e 100644 --- a/test/jdk/java/util/logging/TestAppletLoggerContext.java +++ b/test/jdk/java/util/logging/TestAppletLoggerContext.java @@ -447,7 +447,7 @@ public class TestAppletLoggerContext { Logger logger4b = manager.getLogger(Logger.GLOBAL_LOGGER_NAME); assertNotNull(logger4); assertNotNull(logger4b); - expected = (System.getSecurityManager() == null ? global : global2);; + expected = (System.getSecurityManager() == null ? global : global2); assertEquals(logger4, expected); assertEquals(logger4b, expected); diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java index 4992553eba9..3ae2e777810 100644 --- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java +++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorer.java @@ -134,7 +134,7 @@ public class SSLSocketExplorer { position += n; } - capabilities = SSLExplorer.explore(buffer, 0, recordLength);; + capabilities = SSLExplorer.explore(buffer, 0, recordLength); if (capabilities != null) { System.out.println("Record version: " + capabilities.getRecordVersion()); diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java index 00d00001d87..7193fcaf136 100644 --- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java +++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java @@ -135,7 +135,7 @@ public class SSLSocketExplorerFailure { position += n; } - capabilities = SSLExplorer.explore(buffer, 0, recordLength);; + capabilities = SSLExplorer.explore(buffer, 0, recordLength); if (capabilities != null) { System.out.println("Record version: " + capabilities.getRecordVersion()); diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java index 724a37e1a80..0cea7323b83 100644 --- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java +++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java @@ -138,7 +138,7 @@ public class SSLSocketExplorerMatchedSNI { position += n; } - capabilities = SSLExplorer.explore(buffer, 0, recordLength);; + capabilities = SSLExplorer.explore(buffer, 0, recordLength); if (capabilities != null) { System.out.println("Record version: " + capabilities.getRecordVersion()); diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java index 732e0cf3097..619a997eda2 100644 --- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java +++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java @@ -130,7 +130,7 @@ public class SSLSocketExplorerUnmatchedSNI { position += n; } - capabilities = SSLExplorer.explore(buffer, 0, recordLength);; + capabilities = SSLExplorer.explore(buffer, 0, recordLength); if (capabilities != null) { System.out.println("Record version: " + capabilities.getRecordVersion()); diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java index 8f2b7816864..8451b44f0bf 100644 --- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java +++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java @@ -129,7 +129,7 @@ public class SSLSocketExplorerWithCliSNI { position += n; } - capabilities = SSLExplorer.explore(buffer, 0, recordLength);; + capabilities = SSLExplorer.explore(buffer, 0, recordLength); if (capabilities != null) { System.out.println("Record version: " + capabilities.getRecordVersion()); diff --git a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java index f026f32e781..8b891e804e4 100644 --- a/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java +++ b/test/jdk/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java @@ -129,7 +129,7 @@ public class SSLSocketExplorerWithSrvSNI { position += n; } - capabilities = SSLExplorer.explore(buffer, 0, recordLength);; + capabilities = SSLExplorer.explore(buffer, 0, recordLength); if (capabilities != null) { System.out.println("Record version: " + capabilities.getRecordVersion()); diff --git a/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java index 348012f54bf..fdd6e542440 100644 --- a/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java +++ b/test/jdk/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java @@ -37,7 +37,7 @@ import com.sun.media.sound.*; public class NewModelIdentifierStringStringInt { public static void main(String[] args) throws Exception { - ModelIdentifier id = new ModelIdentifier("test","a",1);; + ModelIdentifier id = new ModelIdentifier("test","a",1); if(!id.getObject().equals("test")) throw new RuntimeException("id.getObject() doesn't return \"test\"!"); if(!id.getVariable().equals("a")) diff --git a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java index 0330628c8b6..eaff35c2c3c 100644 --- a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java +++ b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff.java @@ -56,7 +56,7 @@ public class NoteOff { assertEquals(v[0].active, true); channel.noteOff(60); soft.read(1); - v = soft.synth.getVoiceStatus();; + v = soft.synth.getVoiceStatus(); assertEquals(v[0].active, false); soft.close(); diff --git a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java index 71172a049da..8143ee846a5 100644 --- a/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java +++ b/test/jdk/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java @@ -56,7 +56,7 @@ public class NoteOff2 { assertEquals(v[0].active, true); channel.noteOff(60); soft.read(1); - v = soft.synth.getVoiceStatus();; + v = soft.synth.getVoiceStatus(); assertEquals(v[0].active, false); soft.close(); diff --git a/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java b/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java index 95883556a05..c1d2d9a2ed0 100644 --- a/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java +++ b/test/jdk/javax/sql/testng/test/rowset/BaseRowSetTests.java @@ -355,7 +355,7 @@ public class BaseRowSetTests extends CommonRowSetTests { Blob aBlob = new SerialBlob(new StubBlob()); Clob aClob = new SerialClob(new StubClob()); Reader rdr = new StringReader(query); - InputStream is = new StringBufferInputStream(query);; + InputStream is = new StringBufferInputStream(query); brs = new StubBaseRowSet(); brs.setBytes(1, bytes); brs.setAsciiStream(2, is, query.length()); diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java index a6756a13a4a..95cc508828a 100644 --- a/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java +++ b/test/jdk/javax/sql/testng/test/rowset/serial/SQLInputImplTests.java @@ -183,7 +183,7 @@ public class SQLInputImplTests extends BaseTest { */ @Test(enabled = true) public void test10() throws Exception { - URL u = new URL("http://www.oracle.com/");; + URL u = new URL("http://www.oracle.com/"); Object[] values = {u}; SQLInputImpl sqli = new SQLInputImpl(values, map); URL u2 = sqli.readURL(); diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java index 077ce43da85..345315b7f05 100644 --- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java +++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialArrayTests.java @@ -230,7 +230,7 @@ public class SerialArrayTests extends BaseTest { @Test public void test18() throws Exception { SerialArray sa = new SerialArray(a); - SerialArray sa1 = serializeDeserializeObject(sa);; + SerialArray sa1 = serializeDeserializeObject(sa); assertTrue(sa.equals(sa1)); } } diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java index ff963ae7ba8..8ef215584a9 100644 --- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java +++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialExceptionTests.java @@ -108,6 +108,6 @@ public class SerialExceptionTests extends BaseTest { assertTrue(ex1.getMessage().equals(reason) && ex1.getSQLState() == null && ex1.getCause() == null - && ex1.getErrorCode() == 0);; + && ex1.getErrorCode() == 0); } } diff --git a/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java b/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java index 84a0ff2aaaf..79ac2421c9a 100644 --- a/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java +++ b/test/jdk/javax/sql/testng/test/rowset/serial/SerialStructTests.java @@ -134,7 +134,7 @@ public class SerialStructTests extends BaseTest { @Test public void test08() throws Exception { SerialStruct ss = new SerialStruct(struct, map); - SerialStruct ss1 = serializeDeserializeObject(ss);; + SerialStruct ss1 = serializeDeserializeObject(ss); assertTrue(ss.equals(ss1)); } } diff --git a/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java b/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java index 923895447c7..a81262f9405 100644 --- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java +++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java @@ -194,11 +194,11 @@ public class TestRecordingFile { rotator.stop(); } r2.stop(); - r2.dump(twoEventTypes);; + r2.dump(twoEventTypes); } FlightRecorder.register(Event3.class); r1.stop(); - r1.dump(threeEventTypes);; + r1.dump(threeEventTypes); } try (RecordingFile f = new RecordingFile(twoEventTypes)) { List types = f.readEventTypes(); diff --git a/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java b/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java index 3d7d143f44c..3dbe26eea16 100644 --- a/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java +++ b/test/jdk/jdk/jfr/api/consumer/filestream/TestReuse.java @@ -89,7 +89,7 @@ public class TestReuse { es.setReuse(true); es.onEvent(e -> { if(events.containsKey(e)) { - success.set(true);; + success.set(true); es.close(); } events.put(e,e); diff --git a/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java b/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java index af740a6e559..7ee9748520a 100644 --- a/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java +++ b/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java @@ -101,7 +101,7 @@ public class TestEventTime { MyEvent event = new MyEvent(id); event.begin(); if (!CommonHelper.hasFastTimeEnabled()) { - CommonHelper.waitForSystemCurrentMillisToChange();; + CommonHelper.waitForSystemCurrentMillisToChange(); } actualOrder.add(new TimeEvent(id, true)); return event; @@ -110,7 +110,7 @@ public class TestEventTime { private static void endEvent(MyEvent event) throws Exception { event.end(); if (!CommonHelper.hasFastTimeEnabled()) { - CommonHelper.waitForSystemCurrentMillisToChange();; + CommonHelper.waitForSystemCurrentMillisToChange(); } event.commit(); actualOrder.add(new TimeEvent(event.id, false)); diff --git a/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java b/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java index 5be87e78e10..7f6f7be79d2 100644 --- a/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java +++ b/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java @@ -58,8 +58,8 @@ public final class TestActiveSettingEvent { private static final String ACTIVE_SETTING_EVENT_NAME = EventNames.ActiveSetting; public static void main(String[] args) throws Throwable { - testDefaultSettings();; - testProfileSettings();; + testDefaultSettings(); + testProfileSettings(); testNewSettings(); testChangedSetting(); testUnregistered(); diff --git a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java index 724a16715bb..105160237cc 100644 --- a/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java +++ b/test/jdk/sanity/client/lib/SwingSet3/src/com/sun/swingset3/demos/tooltip/ToolTipDemo.java @@ -58,9 +58,9 @@ public class ToolTipDemo extends JPanel { public static final String DEMO_TITLE = ToolTipDemo.class.getAnnotation(DemoProperties.class).value(); private final static ResourceManager resourceManager = new ResourceManager(ToolTipDemo.class); - public static final String PLAIN_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.plain");; + public static final String PLAIN_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.plain"); public static final String PLAIN_TOOLTIP_TEXT = "A simple one line tip."; - public static final String HTML_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.html");; + public static final String HTML_TOOLTIP_COMP_TITLE = resourceManager.getString("ToolTipDemo.html"); public static final String HTML_TOOLTIP_TEXT = "In case you thought that tooltips had to be

" + "boring, one line descriptions, the Swing! team

" + "is happy to shatter your illusions.

" + diff --git a/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java b/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java index a16f37f1236..62cc0f52720 100644 --- a/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java +++ b/test/jdk/sun/java2d/cmm/ColorConvertOp/ImageFactory.java @@ -258,7 +258,7 @@ public class ImageFactory { for (int j = 0; j < HEIGHT; j++) { pixel[0] = (i/255.0)*(cs.getMaxValue(0) - cs.getMinValue(0)) + - cs.getMinValue(0);; + cs.getMinValue(0); sm.setPixel(i, j, pixel, data); } } @@ -268,7 +268,7 @@ public class ImageFactory { for (int j = 0; j < HEIGHT; j++) { pixel[0] = (i/255.0f)*(cs.getMaxValue(0) - cs.getMinValue(0)) + - cs.getMinValue(0);; + cs.getMinValue(0); sm.setPixel(i, j, pixel, data); } } diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java index 3edf02d70d7..0037ac7bad6 100644 --- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java +++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java @@ -348,7 +348,7 @@ public class CPBuilder { for (String key : certmap.keySet()) { String certStr = certmap.get(key); ByteArrayInputStream is = - new ByteArrayInputStream(certStr.getBytes());; + new ByteArrayInputStream(certStr.getBytes()); Certificate cert = cf.generateCertificate(is); entries.add(cert); } diff --git a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java index e6a9765037b..9785b270299 100644 --- a/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java +++ b/test/jdk/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java @@ -353,7 +353,7 @@ public class CPBuilderWithMD5 { for (String key : certmap.keySet()) { String certStr = certmap.get(key); ByteArrayInputStream is = - new ByteArrayInputStream(certStr.getBytes());; + new ByteArrayInputStream(certStr.getBytes()); Certificate cert = cf.generateCertificate(is); entries.add(cert); } diff --git a/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java b/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java index 401dfe6ca31..d2ca78f044a 100644 --- a/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java +++ b/test/jdk/sun/tools/jhsdb/BasicLauncherTest.java @@ -134,7 +134,7 @@ public class BasicLauncherTest { launcher.addToolArg("--pid=" + Long.toString(theApp.getPid())); ProcessBuilder processBuilder = SATestUtils.createProcessBuilder(launcher); - OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);; + OutputAnalyzer output = ProcessTools.executeProcess(processBuilder); output.shouldContain("No deadlocks found"); output.shouldNotContain("illegal bci"); output.shouldNotContain("AssertionFailure"); @@ -171,7 +171,7 @@ public class BasicLauncherTest { ProcessBuilder processBuilder = SATestUtils.createProcessBuilder(launcher); processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT); - OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);; + OutputAnalyzer output = ProcessTools.executeProcess(processBuilder); output.shouldContain(expectedMessage); unexpectedMessage.ifPresent(output::shouldNotContain); output.shouldHaveExitValue(0); diff --git a/test/jdk/tools/jar/modularJar/Basic.java b/test/jdk/tools/jar/modularJar/Basic.java index 26e9b835a49..177ae2a8453 100644 --- a/test/jdk/tools/jar/modularJar/Basic.java +++ b/test/jdk/tools/jar/modularJar/Basic.java @@ -123,7 +123,7 @@ public class Basic { moduleName = mn; mainClass = mc; version = v; message = m; hashes = h; this.requires = requires != null ? requires : Collections.emptySet(); this.exports = exports != null ? exports : Collections.emptySet(); - this.uses = uses != null ? uses : Collections.emptySet();; + this.uses = uses != null ? uses : Collections.emptySet(); this.provides = provides != null ? provides : Collections.emptySet(); this.packages = Stream.concat(this.exports.stream(), contains.stream()) .collect(Collectors.toSet()); diff --git a/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java b/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java index 7acd05676b4..35f43edcb39 100644 --- a/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java +++ b/test/jdk/tools/jar/multiRelease/data/test13/v10/version/Nested.java @@ -12,7 +12,7 @@ public class Nested { int save = getVersion(); class nestnested { - int save = getVersion();; + int save = getVersion(); } } } diff --git a/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java b/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java index 1a8f1d89f77..ab84566e827 100644 --- a/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java +++ b/test/langtools/jdk/javadoc/tool/api/basic/JavadocTaskImplTest.java @@ -104,7 +104,7 @@ public class JavadocTaskImplTest extends APITest { File outDir = getOutDir(); fm.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(outDir)); try { - DocumentationTask t = new JavadocTaskImpl(c, null, null, files);; + DocumentationTask t = new JavadocTaskImpl(c, null, null, files); error("getTask succeeded, no exception thrown"); } catch (NullPointerException e) { System.err.println("exception caught as expected: " + e); diff --git a/test/langtools/jdk/jshell/VariablesTest.java b/test/langtools/jdk/jshell/VariablesTest.java index 4224331b331..be957d5065e 100644 --- a/test/langtools/jdk/jshell/VariablesTest.java +++ b/test/langtools/jdk/jshell/VariablesTest.java @@ -340,7 +340,7 @@ public class VariablesTest extends KullaTesting { //assertEquals(getState().source(snippet), src); //assertEquals(snippet, undefKey); assertEquals(getState().status(undefKey), RECOVERABLE_NOT_DEFINED); - List unr = getState().unresolvedDependencies((VarSnippet) undefKey).collect(toList());; + List unr = getState().unresolvedDependencies((VarSnippet) undefKey).collect(toList()); assertEquals(unr.size(), 1); assertEquals(unr.get(0), "class undefined"); assertVariables(variable("undefined", "d")); diff --git a/test/langtools/tools/doclint/RunTest.java b/test/langtools/tools/doclint/RunTest.java index 2d287136b47..aff4b6c855b 100644 --- a/test/langtools/tools/doclint/RunTest.java +++ b/test/langtools/tools/doclint/RunTest.java @@ -59,7 +59,7 @@ public class RunTest { System.err.println("test: " + m.getName()); try { StringWriter sw = new StringWriter(); - PrintWriter pw = new PrintWriter(sw);; + PrintWriter pw = new PrintWriter(sw); m.invoke(this, new Object[] { pw }); String out = sw.toString(); System.err.println(">>> " + out.replace("\n", "\n>>> ")); diff --git a/test/langtools/tools/javac/generics/inference/4954546/T4954546.java b/test/langtools/tools/javac/generics/inference/4954546/T4954546.java index 7ce1dcb5a3a..456624b8333 100644 --- a/test/langtools/tools/javac/generics/inference/4954546/T4954546.java +++ b/test/langtools/tools/javac/generics/inference/4954546/T4954546.java @@ -46,7 +46,7 @@ public class T4954546 { f(true, new A(), new B()); } static void f(boolean cond, A a, B b) { - (cond?a:b).f();; - (cond?a:b).g();; + (cond?a:b).f(); + (cond?a:b).g(); } }