Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 36545 invoked from network); 31 Jan 2003 07:18:15 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 31 Jan 2003 07:18:15 -0000 Received: (qmail 6420 invoked by uid 97); 31 Jan 2003 07:19:51 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@nagoya.betaversion.org Received: (qmail 6413 invoked from network); 31 Jan 2003 07:19:51 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 31 Jan 2003 07:19:51 -0000 Received: (qmail 36458 invoked by uid 500); 31 Jan 2003 07:18:12 -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 36447 invoked by uid 500); 31 Jan 2003 07:18:12 -0000 Received: (qmail 36444 invoked from network); 31 Jan 2003 07:18:11 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 31 Jan 2003 07:18:11 -0000 Received: (qmail 57809 invoked by uid 1438); 31 Jan 2003 07:18:10 -0000 Date: 31 Jan 2003 07:18:10 -0000 Message-ID: <20030131071810.57805.qmail@icarus.apache.org> From: mcconnell@apache.org To: avalon-sandbox-cvs@apache.org Subject: cvs commit: avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service DefaultRegistry.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 mcconnell 2003/01/30 23:18:10 Modified: merlin/src/java/org/apache/avalon/merlin/block/impl DefaultBlockLoader.java merlin/src/java/org/apache/avalon/merlin/service DefaultRegistry.java Log: Fixing bugs introduced by my last bug fix! Revision Changes Path 1.5 +1 -2 avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java Index: DefaultBlockLoader.java =================================================================== RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/block/impl/DefaultBlockLoader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DefaultBlockLoader.java 30 Jan 2003 11:15:51 -0000 1.4 +++ DefaultBlockLoader.java 31 Jan 2003 07:18:10 -0000 1.5 @@ -266,7 +266,6 @@ m_registry = null; m_system = null; m_home = null; - m_resolver.dispose(); m_resolver = null; } 1.6 +2 -2 avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java Index: DefaultRegistry.java =================================================================== RCS file: /home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/service/DefaultRegistry.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DefaultRegistry.java 29 Jan 2003 17:50:27 -0000 1.5 +++ DefaultRegistry.java 31 Jan 2003 07:18:10 -0000 1.6 @@ -108,7 +108,7 @@ * management naming context hierachy. */ public DefaultRegistry( ) - throws NullPointerException, MalformedURLException + throws NullPointerException, ServiceException { this( "localhost" ); } --------------------------------------------------------------------- To unsubscribe, e-mail: avalon-cvs-unsubscribe@jakarta.apache.org For additional commands, e-mail: avalon-cvs-help@jakarta.apache.org