Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-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 E6C2B82D5 for ; Sat, 3 Sep 2011 12:43:57 +0000 (UTC) Received: (qmail 34843 invoked by uid 500); 3 Sep 2011 12:43:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 34785 invoked by uid 500); 3 Sep 2011 12:43:54 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 34778 invoked by uid 99); 3 Sep 2011 12:43:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Sep 2011 12:43:52 +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; Sat, 03 Sep 2011 12:43:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 270282388A19 for ; Sat, 3 Sep 2011 12:43:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1164858 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Date: Sat, 03 Sep 2011 12:43:28 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110903124328.270282388A19@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Sat Sep 3 12:43:27 2011 New Revision: 1164858 URL: http://svn.apache.org/viewvc?rev=1164858&view=rev Log: Close cursor Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=1164858&r1=1164857&r2=1164858&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Sat Sep 3 12:43:27 2011 @@ -478,7 +478,6 @@ public class SubentryInterceptor extends { if ( aps.next() ) { - aps.close(); return true; } } @@ -486,7 +485,17 @@ public class SubentryInterceptor extends { throw new LdapOperationException( e.getMessage(), e ); } - + finally + { + try + { + aps.close(); + } + catch ( Exception e ) + { + LOG.error( I18n.err( I18n.ERR_168 ), e ); + } + } return false; }