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

8193584: (testbug) TestSocketFactory fails intermittently with ConcurrentModificationException

Browse Source 
Reviewed-by: bpb, lancea
This commit is contained in:
Roger Riggs 2018-03-16 16:17:17 -04:00
parent 771a76dd9e
commit ef24e174a4
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/jdk/java/rmi/testlibrary/TestSocketFactory.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -135,7 +135,7 @@ public class TestSocketFactory extends RMISocketFactory
* @param matchBytes bytes to match after the trigger has been seen * @param matchBytes bytes to match after the trigger has been seen
* @param replaceBytes bytes to replace the matched bytes * @param replaceBytes bytes to replace the matched bytes
*/ */
public void setMatchReplaceBytes(byte[] triggerBytes, byte[] matchBytes, public synchronized void setMatchReplaceBytes(byte[] triggerBytes, byte[] matchBytes,
byte[] replaceBytes) { byte[] replaceBytes) {
this.triggerBytes = Objects.requireNonNull(triggerBytes, "triggerBytes"); this.triggerBytes = Objects.requireNonNull(triggerBytes, "triggerBytes");
this.matchBytes = Objects.requireNonNull(matchBytes, "matchBytes"); this.matchBytes = Objects.requireNonNull(matchBytes, "matchBytes");
@ -147,7 +147,7 @@ public class TestSocketFactory extends RMISocketFactory
} }
@Override @Override
public Socket createSocket(String host, int port) throws IOException { public synchronized Socket createSocket(String host, int port) throws IOException {
Socket socket = RMISocketFactory.getDefaultSocketFactory() Socket socket = RMISocketFactory.getDefaultSocketFactory()
.createSocket(host, port); .createSocket(host, port);
InterposeSocket s = new InterposeSocket(socket, InterposeSocket s = new InterposeSocket(socket,
@ -160,13 +160,13 @@ public class TestSocketFactory extends RMISocketFactory
* Return the current list of sockets. * Return the current list of sockets.
* @return Return a snapshot of the current list of sockets * @return Return a snapshot of the current list of sockets
*/ */
public List<InterposeSocket> getSockets() { public synchronized List<InterposeSocket> getSockets() {
List<InterposeSocket> snap = new ArrayList<>(sockets); List<InterposeSocket> snap = new ArrayList<>(sockets);
return snap; return snap;
} }
@Override @Override
public ServerSocket createServerSocket(int port) throws IOException { public synchronized ServerSocket createServerSocket(int port) throws IOException {
ServerSocket serverSocket = RMISocketFactory.getDefaultSocketFactory() ServerSocket serverSocket = RMISocketFactory.getDefaultSocketFactory()
.createServerSocket(port); .createServerSocket(port);
@ -180,7 +180,7 @@ public class TestSocketFactory extends RMISocketFactory
* Return the current list of server sockets. * Return the current list of server sockets.
* @return Return a snapshot of the current list of server sockets * @return Return a snapshot of the current list of server sockets
*/ */
public List<InterposeServerSocket> getServerSockets() { public synchronized List<InterposeServerSocket> getServerSockets() {
List<InterposeServerSocket> snap = new ArrayList<>(serverSockets); List<InterposeServerSocket> snap = new ArrayList<>(serverSockets);
return snap; return snap;
} }
@ -202,7 +202,7 @@ public class TestSocketFactory extends RMISocketFactory
private final ByteArrayOutputStream inLogStream; private final ByteArrayOutputStream inLogStream;
private final ByteArrayOutputStream outLogStream; private final ByteArrayOutputStream outLogStream;
private final String name; private final String name;
private static volatile int num = 0; // index for created InterposeSockets private static volatile int num = 0; // index for created Interpose509s
/** /**
* Construct a socket that interposes on a socket to match and replace. * Construct a socket that interposes on a socket to match and replace.
@ -457,7 +457,7 @@ public class TestSocketFactory extends RMISocketFactory
* @param matchBytes bytes to match after the trigger has been seen * @param matchBytes bytes to match after the trigger has been seen
* @param replaceBytes bytes to replace the matched bytes * @param replaceBytes bytes to replace the matched bytes
*/ */
public void setMatchReplaceBytes(byte[] triggerBytes, byte[] matchBytes, public synchronized void setMatchReplaceBytes(byte[] triggerBytes, byte[] matchBytes,
byte[] replaceBytes) { byte[] replaceBytes) {
this.triggerBytes = triggerBytes; this.triggerBytes = triggerBytes;
this.matchBytes = matchBytes; this.matchBytes = matchBytes;
@ -468,7 +468,7 @@ public class TestSocketFactory extends RMISocketFactory
* Return a snapshot of the current list of sockets created from this server socket. * Return a snapshot of the current list of sockets created from this server socket.
* @return Return a snapshot of the current list of sockets * @return Return a snapshot of the current list of sockets
*/ */
public List<InterposeSocket> getSockets() { public synchronized List<InterposeSocket> getSockets() {
List<InterposeSocket> snap = new ArrayList<>(sockets); List<InterposeSocket> snap = new ArrayList<>(sockets);
return snap; return snap;
} }
@ -501,9 +501,12 @@ public class TestSocketFactory extends RMISocketFactory
@Override @Override
public Socket accept() throws IOException { public Socket accept() throws IOException {
Socket s = socket.accept(); Socket s = socket.accept();
InterposeSocket socket = new InterposeSocket(s, matchBytes, replaceBytes); synchronized(this) {
sockets.add(socket); InterposeSocket aSocket = new InterposeSocket(s, matchBytes,
return socket; replaceBytes);
sockets.add(aSocket);
return aSocket;
}
} }
@Override @Override