Repository: ignite Updated Branches: refs/heads/master 142648df5 -> 93ed0d5ba
IGNITE-10657 Thin clients should call onSessionExpired on disconnect to avoid memory leak - Fixes #5658. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93ed0d5b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93ed0d5b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93ed0d5b Branch: refs/heads/master Commit: 93ed0d5ba6d5377a0c08eda7b5f432911a186c5b Parents: 142648d Author: Andrei Aleksandrov <aealexsand...@gmail.com> Authored: Fri Dec 14 19:48:53 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Fri Dec 14 19:49:46 2018 +0300 ---------------------------------------------------------------------- .../odbc/ClientListenerAbstractConnectionContext.java | 6 ++++++ .../internal/processors/odbc/jdbc/JdbcConnectionContext.java | 2 ++ .../internal/processors/odbc/odbc/OdbcConnectionContext.java | 2 ++ .../processors/platform/client/ClientConnectionContext.java | 2 ++ 4 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/93ed0d5b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java index 856868d..14fcf9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerAbstractConnectionContext.java @@ -126,4 +126,10 @@ public abstract class ClientListenerAbstractConnectionContext implements ClientL return authCtx; } + + /** {@inheritDoc} */ + @Override public void onDisconnected() { + if (ctx.security().enabled()) + ctx.security().onSessionExpired(secCtx.subject().id()); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/93ed0d5b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java index c80136d..8ba0790 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java @@ -207,5 +207,7 @@ public class JdbcConnectionContext extends ClientListenerAbstractConnectionConte /** {@inheritDoc} */ @Override public void onDisconnected() { handler.onDisconnect(); + + super.onDisconnected(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/93ed0d5b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java index 5592aab..cf11270 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcConnectionContext.java @@ -188,5 +188,7 @@ public class OdbcConnectionContext extends ClientListenerAbstractConnectionConte /** {@inheritDoc} */ @Override public void onDisconnected() { handler.onDisconnect(); + + super.onDisconnected(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/93ed0d5b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java index ffe38ca..5e68c34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java @@ -143,6 +143,8 @@ public class ClientConnectionContext extends ClientListenerAbstractConnectionCon /** {@inheritDoc} */ @Override public void onDisconnected() { resReg.clean(); + + super.onDisconnected(); } /**