From f5f186e47ad59a693be43a1c1c455db894b1c27c Mon Sep 17 00:00:00 2001
From: xiaojizhong <xjz@suasea.com>
Date: Fri, 11 Aug 2017 09:47:46 +0800
Subject: [PATCH] Fix to the process of SessionAwareMsg and SessionCtrlMsg of
 SessionManagerAactor's OnReceive

---
 .../server/actors/session/SessionManagerActor.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java b/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java
index 9f8084bff0..f9b54a82c8 100644
--- a/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/session/SessionManagerActor.java
@@ -50,7 +50,9 @@ public class SessionManagerActor extends ContextAwareActor {
 
     @Override
     public void onReceive(Object msg) throws Exception {
-        if (msg instanceof SessionAwareMsg) {
+        if (msg instanceof SessionCtrlMsg) {
+            onSessionCtrlMsg((SessionCtrlMsg) msg);
+        } else if (msg instanceof SessionAwareMsg) {
             forwardToSessionActor((SessionAwareMsg) msg);
         } else if (msg instanceof SessionTerminationMsg) {
             onSessionTermination((SessionTerminationMsg) msg);
@@ -58,8 +60,6 @@ public class SessionManagerActor extends ContextAwareActor {
             onTermination((Terminated) msg);
         } else if (msg instanceof SessionTimeoutMsg) {
             onSessionTimeout((SessionTimeoutMsg) msg);
-        } else if (msg instanceof SessionCtrlMsg) {
-            onSessionCtrlMsg((SessionCtrlMsg) msg);
         } else if (msg instanceof ClusterEventMsg) {
             broadcast(msg);
         }