Return-Path: X-Original-To: apmail-onami-commits-archive@minotaur.apache.org Delivered-To: apmail-onami-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 48AD4DCA3 for ; Tue, 8 Jan 2013 12:45:29 +0000 (UTC) Received: (qmail 53276 invoked by uid 500); 8 Jan 2013 12:45:29 -0000 Delivered-To: apmail-onami-commits-archive@onami.apache.org Received: (qmail 53245 invoked by uid 500); 8 Jan 2013 12:45:29 -0000 Mailing-List: contact commits-help@onami.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@onami.incubator.apache.org Delivered-To: mailing list commits@onami.incubator.apache.org Received: (qmail 53236 invoked by uid 99); 8 Jan 2013 12:45:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jan 2013 12:45:29 +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; Tue, 08 Jan 2013 12:45:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B9C5423888E7; Tue, 8 Jan 2013 12:45:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1430258 - /incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java Date: Tue, 08 Jan 2013 12:45:06 -0000 To: commits@onami.incubator.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130108124506.B9C5423888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simonetripodi Date: Tue Jan 8 12:45:06 2013 New Revision: 1430258 URL: http://svn.apache.org/viewvc?rev=1430258&view=rev Log: [ONAMI-44] Disposables should be processed in reverse order to their registration - patch submitted by Mikhail Mazursky Modified: incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java Modified: incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java URL: http://svn.apache.org/viewvc/incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java?rev=1430258&r1=1430257&r2=1430258&view=diff ============================================================================== --- incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java (original) +++ incubator/onami/trunk/lifecycle/src/main/java/org/apache/onami/lifecycle/Disposer.java Tue Jan 8 12:45:06 2013 @@ -21,8 +21,7 @@ package org.apache.onami.lifecycle; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.LinkedList; -import java.util.List; +import java.util.Stack; /** * A Disposer is a mini-container that releases resources @@ -34,7 +33,7 @@ public final class Disposer /** * List of elements have to be disposed. */ - private final List disposables = new LinkedList(); + private final Stack disposables = new Stack(); /** * Register an injectee and its related method to release resources. @@ -44,7 +43,7 @@ public final class Disposer */ void register( Method disposeMethod, I injectee ) { - disposables.add( new Disposable( disposeMethod, injectee ) ); + disposables.push( new Disposable( disposeMethod, injectee ) ); } /** @@ -68,10 +67,9 @@ public final class Disposer { disposeHandler = new NoOpDisposeHandler(); } - - for ( Disposable disposable : disposables ) + while ( !disposables.isEmpty() ) { - disposable.dispose( disposeHandler ); + disposables.pop().dispose( disposeHandler ); } }