Parcourir la source

ZOOKEEPER-1267. closeSession flag in finalRequestProcessor is superfluous (Thomas Koch via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1190450 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt il y a 13 ans
Parent
commit
7f317c5b01

+ 3 - 0
CHANGES.txt

@@ -94,6 +94,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1265. Normalize switch cases lists on request types
   (Thomas Koch via phunt)
 
+  ZOOKEEPER-1267. closeSession flag in finalRequestProcessor is superfluous
+  (Thomas Koch via phunt)
+
 Release 3.4.0 - 
 
 Non-backward compatible changes:

+ 1 - 3
src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java

@@ -151,7 +151,6 @@ public class FinalRequestProcessor implements RequestProcessor {
         zks.decInProcess();
         Code err = Code.OK;
         Record rsp = null;
-        boolean closeSession = false;
         try {
             if (request.getHdr() != null && request.getHdr().getType() == OpCode.error) {
                 throw KeeperException.create(KeeperException.Code.get((
@@ -246,7 +245,6 @@ public class FinalRequestProcessor implements RequestProcessor {
             }
             case OpCode.closeSession: {
                 lastOp = "CLOS";
-                closeSession = true;
                 err = Code.get(rc.err);
                 break;
             }
@@ -408,7 +406,7 @@ public class FinalRequestProcessor implements RequestProcessor {
 
         try {
             cnxn.sendResponse(hdr, rsp, "response");
-            if (closeSession) {
+            if (request.type == OpCode.closeSession) {
                 cnxn.sendCloseSession();
             }
         } catch (IOException e) {