Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 28007 invoked from network); 9 Nov 2002 03:10:00 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 9 Nov 2002 03:10:00 -0000 Received: (qmail 27187 invoked by uid 97); 9 Nov 2002 03:11:04 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 27153 invoked by uid 97); 9 Nov 2002 03:11:03 -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 27131 invoked by uid 97); 9 Nov 2002 03:11:03 -0000 X-Antivirus: nagoya (v4218 created Aug 14 2002) Date: 9 Nov 2002 03:09:53 -0000 Message-ID: <20021109030953.2253.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-avalon-excalibur-cvs@apache.org Subject: cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup FortressServiceManager.java FortressServiceSelector.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 donaldp 2002/11/08 19:09:53 Modified: fortress/src/java/org/apache/excalibur/fortress/handler AbstractComponentHandler.java fortress/src/java/org/apache/excalibur/fortress/lookup FortressServiceManager.java FortressServiceSelector.java Log: Make sure initialization occurs inside get() rather than requiring all users initialize it before calling get() Revision Changes Path 1.29 +6 -5 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java Index: AbstractComponentHandler.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/handler/AbstractComponentHandler.java,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- AbstractComponentHandler.java 8 Nov 2002 02:32:31 -0000 1.28 +++ AbstractComponentHandler.java 9 Nov 2002 03:09:52 -0000 1.29 @@ -206,11 +206,12 @@ public Object get() throws Exception { - if( !m_initialized ) + synchronized( this ) { - final String message = - "You cannot get a component from an uninitialized holder"; - throw new IllegalStateException( message ); + if( !m_initialized ) + { + initialize(); + } } if( m_disposed ) 1.23 +1 -6 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceManager.java Index: FortressServiceManager.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceManager.java,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- FortressServiceManager.java 9 Nov 2002 02:54:54 -0000 1.22 +++ FortressServiceManager.java 9 Nov 2002 03:09:52 -0000 1.23 @@ -124,11 +124,6 @@ try { final ComponentHandler handler = (ComponentHandler)result; - if( !handler.isInitialized() ) - { - ContainerUtil.initialize( handler ); - } - final Object component = handler.get(); m_used.put( component, handler ); return component; 1.15 +8 -9 jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceSelector.java Index: FortressServiceSelector.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/lookup/FortressServiceSelector.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- FortressServiceSelector.java 8 Nov 2002 02:32:31 -0000 1.14 +++ FortressServiceSelector.java 9 Nov 2002 03:09:53 -0000 1.15 @@ -85,23 +85,22 @@ { if( null == hint ) { - throw new IllegalArgumentException( "hint cannot be null" ); + final String message = "hint cannot be null"; + throw new IllegalArgumentException( message ); } - final ComponentHandler handler = (ComponentHandler)m_components.get( m_role, hint ); + final ComponentHandler handler = + (ComponentHandler)m_components.get( m_role, hint ); if( null == handler ) { + final String message = + "The hint does not exist in the ComponentSelector"; throw new ServiceException( m_role + "/" + hint.toString(), - "The hint does not exist in the ComponentSelector" ); + message ); } try { - if( !handler.isInitialized() ) - { - ContainerUtil.initialize( handler ); - } - final Object component = handler.get(); m_used.put( component, handler ); return component; -- To unsubscribe, e-mail: For additional commands, e-mail: