Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 84025 invoked from network); 9 Apr 2011 23:14:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 9 Apr 2011 23:14:46 -0000 Received: (qmail 82894 invoked by uid 500); 9 Apr 2011 23:14:46 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 82733 invoked by uid 500); 9 Apr 2011 23:14:46 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 82611 invoked by uid 99); 9 Apr 2011 23:14:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Apr 2011 23:14:46 +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, 09 Apr 2011 23:14:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2270523889E3; Sat, 9 Apr 2011 23:14:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1090705 - in /commons/proper/discovery/trunk: pom.xml src/java/org/apache/commons/discovery/tools/Service.java src/test/org/apache/commons/discovery/test/TestAll.java Date: Sat, 09 Apr 2011 23:14:22 -0000 To: commits@commons.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110409231422.2270523889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simonetripodi Date: Sat Apr 9 23:14:21 2011 New Revision: 1090705 URL: http://svn.apache.org/viewvc?rev=1090705&view=rev Log: rollback for DISCOVERY-17, issue is invalid Modified: commons/proper/discovery/trunk/pom.xml commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/Service.java commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java Modified: commons/proper/discovery/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/pom.xml?rev=1090705&r1=1090704&r2=1090705&view=diff ============================================================================== --- commons/proper/discovery/trunk/pom.xml (original) +++ commons/proper/discovery/trunk/pom.xml Sat Apr 9 23:14:21 2011 @@ -108,12 +108,6 @@ 4.8.2 test - - avalon-logkit - avalon-logkit - 2.1 - test - Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/Service.java URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/Service.java?rev=1090705&r1=1090704&r2=1090705&view=diff ============================================================================== --- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/Service.java (original) +++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/Service.java Sat Apr 9 23:14:21 2011 @@ -92,23 +92,32 @@ public class Service { return new Enumeration() { + private S object = getNextClassInstance(); + public boolean hasMoreElements() { - return services.hasNext(); + return object != null; } public S nextElement() { - ResourceClass info = services.nextResourceClass(); - - if (info == null) { + if (object == null) { throw new NoSuchElementException(); } - try { - return spi.newInstance(info.loadClass()); - } catch (Exception e) { - // ignore - } catch (LinkageError le) { - // ignore + S obj = object; + object = getNextClassInstance(); + return obj; + } + + private S getNextClassInstance() { + while (services.hasNext()) { + ResourceClass info = services.nextResourceClass(); + try { + return spi.newInstance(info.loadClass()); + } catch (Exception e) { + // ignore + } catch (LinkageError le) { + // ignore + } } return null; } Modified: commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java?rev=1090705&r1=1090704&r2=1090705&view=diff ============================================================================== --- commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java (original) +++ commons/proper/discovery/trunk/src/test/org/apache/commons/discovery/test/TestAll.java Sat Apr 9 23:14:21 2011 @@ -294,7 +294,7 @@ public class TestAll { @Test public void findImplementationsViaService() { - final int expectedLogImplementations = 3; + final int expectedLogImplementations = 2; int actualLogImplementations = 0; Enumeration logImplementations = providers(newSPInterface(Log.class,