Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2CCDF74E9 for ; Wed, 26 Oct 2011 17:10:13 +0000 (UTC) Received: (qmail 19270 invoked by uid 500); 26 Oct 2011 17:10:13 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 19252 invoked by uid 500); 26 Oct 2011 17:10:13 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 19244 invoked by uid 99); 26 Oct 2011 17:10:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 17:10:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2011 17:10:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 96935238888F for ; Wed, 26 Oct 2011 17:09:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1189318 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java Date: Wed, 26 Oct 2011 17:09:51 -0000 To: commits@zookeeper.apache.org From: phunt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111026170951.96935238888F@eris.apache.org> Author: phunt Date: Wed Oct 26 17:09:51 2011 New Revision: 1189318 URL: http://svn.apache.org/viewvc?rev=1189318&view=rev Log: ZOOKEEPER-1251. call checkSession at begin of PrepRequestProcessor.pRequest (Thomas Koch via phunt) Modified: zookeeper/trunk/CHANGES.txt zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java Modified: zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1189318&r1=1189317&r2=1189318&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Wed Oct 26 17:09:51 2011 @@ -71,6 +71,9 @@ IMPROVEMENTS: ZOOKEEPER-1254. test correct watch handling with multi ops (Thomas Koch via phunt) + ZOOKEEPER-1251. call checkSession at begin of PrepRequestProcessor.pRequest + (Thomas Koch via phunt) + Release 3.4.0 - Non-backward compatible changes: Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java?rev=1189318&r1=1189317&r2=1189318&view=diff ============================================================================== --- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java (original) +++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java Wed Oct 26 17:09:51 2011 @@ -294,7 +294,6 @@ public class PrepRequestProcessor extend switch (type) { case OpCode.create: - zks.sessionTracker.checkSession(request.sessionId, request.getOwner()); CreateRequest createRequest = (CreateRequest)record; String path = createRequest.getPath(); int lastSlash = path.lastIndexOf('/'); @@ -348,7 +347,6 @@ public class PrepRequestProcessor extend addChangeRecord(new ChangeRecord(request.getHdr().getZxid(), path, s, 0, listACL)); break; case OpCode.delete: - zks.sessionTracker.checkSession(request.sessionId, request.getOwner()); DeleteRequest deleteRequest = (DeleteRequest)record; path = deleteRequest.getPath(); lastSlash = path.lastIndexOf('/'); @@ -371,7 +369,6 @@ public class PrepRequestProcessor extend addChangeRecord(new ChangeRecord(request.getHdr().getZxid(), path, null, -1, null)); break; case OpCode.setData: - zks.sessionTracker.checkSession(request.sessionId, request.getOwner()); SetDataRequest setDataRequest = (SetDataRequest)record; path = setDataRequest.getPath(); nodeRecord = getRecordForPath(path); @@ -383,7 +380,6 @@ public class PrepRequestProcessor extend addChangeRecord(nodeRecord); break; case OpCode.setACL: - zks.sessionTracker.checkSession(request.sessionId, request.getOwner()); SetACLRequest setAclRequest = (SetACLRequest)record; path = setAclRequest.getPath(); listACL = removeDuplicates(setAclRequest.getAcl()); @@ -430,7 +426,6 @@ public class PrepRequestProcessor extend + Long.toHexString(request.sessionId)); break; case OpCode.check: - zks.sessionTracker.checkSession(request.sessionId, request.getOwner()); CheckVersionRequest checkVersionRequest = (CheckVersionRequest)record; path = checkVersionRequest.getPath(); nodeRecord = getRecordForPath(path); @@ -462,6 +457,10 @@ public class PrepRequestProcessor extend request.setTxn(null); try { + if(request.type != OpCode.createSession && request.type != OpCode.closeSession) { + zks.sessionTracker.checkSession(request.sessionId, request.getOwner()); + } + switch (request.type) { case OpCode.create: CreateRequest createRequest = new CreateRequest(); @@ -555,19 +554,6 @@ public class PrepRequestProcessor extend case OpCode.closeSession: pRequest2Txn(request.type, zks.getNextZxid(), request, null); break; - - //All the rest don't need to create a Txn - just verify session - case OpCode.sync: - case OpCode.exists: - case OpCode.getData: - case OpCode.getACL: - case OpCode.getChildren: - case OpCode.getChildren2: - case OpCode.ping: - case OpCode.setWatches: - zks.sessionTracker.checkSession(request.sessionId, - request.getOwner()); - break; } } catch (KeeperException e) { if (request.getHdr() != null) {