Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 55389 invoked from network); 6 Feb 2003 22:19:49 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 6 Feb 2003 22:19:49 -0000 Received: (qmail 17255 invoked by uid 97); 6 Feb 2003 22:21:22 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@nagoya.betaversion.org Received: (qmail 17247 invoked from network); 6 Feb 2003 22:21:22 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 6 Feb 2003 22:21:22 -0000 Received: (qmail 54426 invoked by uid 500); 6 Feb 2003 22:19:37 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 54393 invoked by uid 500); 6 Feb 2003 22:19:36 -0000 Received: (qmail 54387 invoked from network); 6 Feb 2003 22:19:36 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 6 Feb 2003 22:19:36 -0000 Received: (qmail 73709 invoked by uid 1152); 6 Feb 2003 22:19:35 -0000 Date: 6 Feb 2003 22:19:35 -0000 Message-ID: <20030206221935.73708.qmail@icarus.apache.org> From: bloritsch@apache.org To: avalon-logkit-cvs@apache.org Subject: cvs commit: avalon-logkit/src/test/org/apache/log/test LoggerListenerTestCase.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bloritsch 2003/02/06 14:19:35 Modified: src/java/org/apache/log Hierarchy.java src/test/org/apache/log/test LoggerListenerTestCase.java Log: remove the getLoggerListeners and use identity check on remove Revision Changes Path 1.25 +1 -17 avalon-logkit/src/java/org/apache/log/Hierarchy.java Index: Hierarchy.java =================================================================== RCS file: /home/cvs/avalon-logkit/src/java/org/apache/log/Hierarchy.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- Hierarchy.java 6 Feb 2003 21:15:49 -0000 1.24 +++ Hierarchy.java 6 Feb 2003 22:19:35 -0000 1.25 @@ -217,22 +217,6 @@ } } - public synchronized LoggerListener[] getLoggerListeners() - { - LoggerListener[] listeners = null; - - if ( null == m_loggerListener ) - { - listeners = new LoggerListener[] {}; - } - else - { - listeners = new LoggerListener[] {m_loggerListener}; - } - - return listeners; - } - /** * Remove the LoggerListener associated with hierarchy. Perform this * step before adding a new one if you want to change it. @@ -243,7 +227,7 @@ { if ( null == loggerListener ) throw new NullPointerException( "loggerListener" ); - if ( null != m_loggerListener && m_loggerListener.equals( loggerListener ) ); + if ( null != m_loggerListener && m_loggerListener == loggerListener ); { m_loggerListener = null; } 1.4 +1 -7 avalon-logkit/src/test/org/apache/log/test/LoggerListenerTestCase.java Index: LoggerListenerTestCase.java =================================================================== RCS file: /home/cvs/avalon-logkit/src/test/org/apache/log/test/LoggerListenerTestCase.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LoggerListenerTestCase.java 6 Feb 2003 21:15:49 -0000 1.3 +++ LoggerListenerTestCase.java 6 Feb 2003 22:19:35 -0000 1.4 @@ -95,16 +95,10 @@ final RecordingLoggerListener listener = new RecordingLoggerListener(); hierarchy.addLoggerListener( listener ); - - assertEquals( 1, hierarchy.getLoggerListeners().length ); - hierarchy.removeLoggerListener( listener ); - - assertEquals( 0, hierarchy.getLoggerListeners().length ); - hierarchy.addLoggerListener( listener ); - assertEquals( 1, hierarchy.getLoggerListeners().length ); + // If no exceptions have been thrown, we are in business! } public void testPriorityInheritance() --------------------------------------------------------------------- To unsubscribe, e-mail: avalon-cvs-unsubscribe@jakarta.apache.org For additional commands, e-mail: avalon-cvs-help@jakarta.apache.org