Commit 614ff0c4 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

Fixed leaking of SocketConnection instances. JM-558

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@3390 b35dd754-fafc-0310-a699-88a17e54d16e
parent add428a6
...@@ -395,7 +395,7 @@ public class SocketConnection implements Connection { ...@@ -395,7 +395,7 @@ public class SocketConnection implements Connection {
} }
} }
void release() { private void release() {
writeStarted = -1; writeStarted = -1;
instances.remove(this); instances.remove(this);
} }
...@@ -419,6 +419,7 @@ public class SocketConnection implements Connection { ...@@ -419,6 +419,7 @@ public class SocketConnection implements Connection {
} }
private void closeConnection() { private void closeConnection() {
release();
try { try {
if (tlsStreamHandler == null) { if (tlsStreamHandler == null) {
socket.close(); socket.close();
......
...@@ -159,7 +159,6 @@ public abstract class SocketReader implements Runnable { ...@@ -159,7 +159,6 @@ public abstract class SocketReader implements Runnable {
Log.error(LocaleUtils.getLocalizedString("admin.error.connection") Log.error(LocaleUtils.getLocalizedString("admin.error.connection")
+ "\n" + socket.toString()); + "\n" + socket.toString());
} }
connection.release();
shutdown(); shutdown();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment