Return-Path: Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 17066 invoked by uid 500); 23 May 2003 13:48:07 -0000 Mailing-List: contact cvs-help@avalon.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 cvs@avalon.apache.org Received: (qmail 17045 invoked by uid 500); 23 May 2003 13:48:07 -0000 Received: (qmail 17037 invoked from network); 23 May 2003 13:48:07 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 23 May 2003 13:48:07 -0000 Received: (qmail 92665 invoked by uid 1152); 23 May 2003 13:48:06 -0000 Date: 23 May 2003 13:48:06 -0000 Message-ID: <20030523134806.92664.qmail@icarus.apache.org> From: bloritsch@apache.org To: avalon-excalibur-cvs@apache.org Subject: cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role Role2MetaInfoManager.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N bloritsch 2003/05/23 06:48:06 Modified: fortress/src/java/org/apache/avalon/fortress/impl/role Role2MetaInfoManager.java Log: Ensure that we don't have a NullPointerException Revision Changes Path 1.5 +10 -1 avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/Role2MetaInfoManager.java Index: Role2MetaInfoManager.java =================================================================== RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/role/Role2MetaInfoManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Role2MetaInfoManager.java 22 May 2003 12:29:05 -0000 1.4 +++ Role2MetaInfoManager.java 23 May 2003 13:48:06 -0000 1.5 @@ -103,6 +103,15 @@ */ public MetaInfoEntry getMetaInfoForClassname( final String classname ) { - return new MetaInfoEntry( m_manager.getRoleForClassname( classname ) ); + final RoleEntry roleEntry = m_manager.getRoleForClassname( classname ); + + if ( roleEntry != null ) + { + return new MetaInfoEntry( roleEntry ); + } + else + { + return null; + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org