Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 53886 invoked from network); 7 Dec 2007 15:49:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Dec 2007 15:49:29 -0000 Received: (qmail 70169 invoked by uid 500); 7 Dec 2007 15:49:17 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 70143 invoked by uid 500); 7 Dec 2007 15:49:17 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 70131 invoked by uid 99); 7 Dec 2007 15:49:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2007 07:49:17 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2007 15:49:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AF46C1A9832; Fri, 7 Dec 2007 07:49:04 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r602131 - in /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core: ./ nodetype/ query/ Date: Fri, 07 Dec 2007 15:49:02 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071207154904.AF46C1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Fri Dec 7 07:49:01 2007 New Revision: 602131 URL: http://svn.apache.org/viewvc?rev=602131&view=rev Log: JCR-1224: Release references to JCR items in tearDown Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ConcurrentQueryTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/DerefTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/XPathAxisTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentSaveTest.java Fri Dec 7 07:49:01 2007 @@ -50,9 +50,11 @@ try { if (addNodeSession != null) { addNodeSession.logout(); + addNodeSession = null; } if (removePropertySession != null) { removePropertySession.logout(); + removePropertySession = null; } } finally { super.tearDown(); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Fri Dec 7 07:49:01 2007 @@ -82,6 +82,7 @@ protected void tearDown() throws Exception { if (otherSuperuser != null) { otherSuperuser.logout(); + otherSuperuser = null; } super.tearDown(); } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java Fri Dec 7 07:49:01 2007 @@ -89,7 +89,11 @@ protected void tearDown() throws Exception { if (session != null) { session.logout(); + session = null; } + ntreg = null; + ntDefCollection = null; + nameFactory = null; super.tearDown(); } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ConcurrentQueryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ConcurrentQueryTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ConcurrentQueryTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/ConcurrentQueryTest.java Fri Dec 7 07:49:01 2007 @@ -63,6 +63,7 @@ for (Iterator it = readSessions.iterator(); it.hasNext(); ) { ((Session) it.next()).logout(); } + readSessions.clear(); } /** Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/DerefTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/DerefTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/DerefTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/DerefTest.java Fri Dec 7 07:49:01 2007 @@ -87,6 +87,19 @@ testRootNode.save(); } + protected void tearDown() throws Exception { + andrew = null; + bill = null; + carl = null; + daren = null; + eric = null; + frank = null; + sun = null; + microsoft = null; + ibm = null; + super.tearDown(); + } + /** * Tests various XPath queries with jcr:deref() function. */ Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/LimitAndOffsetTest.java Fri Dec 7 07:49:01 2007 @@ -33,6 +33,14 @@ query = createXPathQuery("/jcr:root" + testRoot + "/* order by @name"); } + protected void tearDown() throws Exception { + node1 = null; + node2 = null; + node3 = null; + query = null; + super.tearDown(); + } + private QueryImpl createXPathQuery(String xpath) throws InvalidQueryException, RepositoryException { QueryManager queryManager = superuser.getWorkspace().getQueryManager(); Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/SkipDeletedNodesTest.java Fri Dec 7 07:49:01 2007 @@ -45,8 +45,10 @@ try { if (s2 != null) { s2.logout(); + s2 = null; } } finally { + qm = null; super.tearDown(); } } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/XPathAxisTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/XPathAxisTest.java?rev=602131&r1=602130&r2=602131&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/XPathAxisTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/XPathAxisTest.java Fri Dec 7 07:49:01 2007 @@ -42,6 +42,16 @@ testRootNode.save(); } + protected void tearDown() throws Exception { + n1 = null; + n2 = null; + n11 = null; + n12 = null; + n21 = null; + n22 = null; + super.tearDown(); + } + public void testChildAxisRoot() throws RepositoryException { String xpath = "/*"; executeXPathQuery(xpath, new Node[]{superuser.getRootNode()});