Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2328CD253 for ; Wed, 26 Sep 2012 12:40:54 +0000 (UTC) Received: (qmail 82698 invoked by uid 500); 26 Sep 2012 12:40:53 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 82625 invoked by uid 500); 26 Sep 2012 12:40:51 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 82577 invoked by uid 99); 26 Sep 2012 12:40:49 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2012 12:40:49 +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 Sep 2012 12:40:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3AECC23888E3; Wed, 26 Sep 2012 12:40:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1390440 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java Date: Wed, 26 Sep 2012 12:40:03 -0000 To: oak-commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120926124003.3AECC23888E3@eris.apache.org> Author: angela Date: Wed Sep 26 12:40:02 2012 New Revision: 1390440 URL: http://svn.apache.org/viewvc?rev=1390440&view=rev Log: fix indention Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java?rev=1390440&r1=1390439&r2=1390440&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java Wed Sep 26 12:40:02 2012 @@ -120,8 +120,7 @@ public class SessionDelegate { refresh(true); } return sessionOperation.perform(); - } - finally { + } finally { sessionOpCount--; } } @@ -230,8 +229,7 @@ public class SessionDelegate { public void save() throws RepositoryException { try { root.commit(conflictHandler); - } - catch (CommitFailedException e) { + } catch (CommitFailedException e) { e.throwRepositoryException(); } } @@ -239,8 +237,7 @@ public class SessionDelegate { public void refresh(boolean keepChanges) { if (keepChanges) { root.rebase(conflictHandler); - } - else { + } else { root.refresh(); } } @@ -376,8 +373,7 @@ public class SessionDelegate { Root currentRoot = contentSession.getLatestRoot(); currentRoot.copy(srcPath, destPath); currentRoot.commit(DefaultConflictHandler.OURS); - } - catch (CommitFailedException e) { + } catch (CommitFailedException e) { e.throwRepositoryException(); } } @@ -418,8 +414,7 @@ public class SessionDelegate { if (!transientOp) { moveRoot.commit(DefaultConflictHandler.OURS); } - } - catch (CommitFailedException e) { + } catch (CommitFailedException e) { e.throwRepositoryException(); } } @@ -540,9 +535,8 @@ public class SessionDelegate { @Override public boolean hasSessionLocalMappings() { if (session instanceof SessionImpl) { - return ((SessionImpl)session).hasSessionLocalMappings(); - } - else { + return ((SessionImpl) session).hasSessionLocalMappings(); + } else { // we don't know return true; }