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

8232446: logging enhancement for rmi when socket closed

Browse Source 
Reviewed-by: rriggs, plevart
This commit is contained in:
Hamlin Li 2019-11-28 13:48:25 +08:00
parent b9c7a608d2
commit cd55d90507
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPConnection.java
View File

@ -209,7 +209,10 @@ public class TCPConnection implements Connection {
* Close the connection. */
public void close() throws IOException
{
TCPTransport.tcpLog.log(Log.BRIEF, "close connection");
if (TCPTransport.tcpLog.isLoggable(Log.BRIEF)) {
TCPTransport.tcpLog.log(Log.BRIEF,
"close connection, socket: " + socket);
}
if (socket != null)
socket.close();

32
src/java.rmi/share/classes/sun/rmi/transport/tcp/TCPTransport.java
View File

@ -273,12 +273,23 @@ public class TCPTransport extends Transport {
private void decrementExportCount() {
assert Thread.holdsLock(this);
exportCount--;
if (tcpLog.isLoggable(Log.VERBOSE)) {
tcpLog.log(Log.VERBOSE,
"server socket: " + server + ", exportCount: " + exportCount);
}
if (exportCount == 0 && getEndpoint().getListenPort() != 0) {
ServerSocket ss = server;
server = null;
try {
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF, "server socket close: " + ss);
}
ss.close();
} catch (IOException e) {
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF,
"server socket close throws: " + e);
}
}
}
}
@ -366,6 +377,10 @@ public class TCPTransport extends Transport {
executeAcceptLoop();
} finally {
try {
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF,
"server socket close: " + serverSocket);
}
/*
* Only one accept loop is started per server
* socket, so after no more connections will be
@ -374,6 +389,10 @@ public class TCPTransport extends Transport {
*/
serverSocket.close();
} catch (IOException e) {
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF,
"server socket close throws: " + e);
}
}
}
}
@ -524,9 +543,15 @@ public class TCPTransport extends Transport {
/** close socket and eat exception */
private static void closeSocket(Socket sock) {
try {
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF, "socket close: " + sock);
}
sock.close();
} catch (IOException ex) {
// eat exception
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF, "socket close throws: " + ex);
}
}
}
@ -591,6 +616,9 @@ public class TCPTransport extends Transport {
conn.close();
} catch (IOException ex) {
// eat exception
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF, "Connection close throws " + ex);
}
}
}
}
@ -723,6 +751,10 @@ public class TCPTransport extends Transport {
// just close socket: this would recurse if we marshal an
// exception to the client and the protocol at other end
// doesn't match.
if (tcpLog.isLoggable(Log.BRIEF)) {
tcpLog.log(Log.BRIEF, "magic or version not match: "
+ magic + ", " + version);
}
closeSocket(socket);
return;
}