Return-Path: Delivered-To: apmail-avalon-cvs-archive@www.apache.org Received: (qmail 65524 invoked from network); 20 Jan 2004 04:50:33 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 20 Jan 2004 04:50:33 -0000 Received: (qmail 27243 invoked by uid 500); 20 Jan 2004 04:50:13 -0000 Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 27167 invoked by uid 500); 20 Jan 2004 04:50:12 -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 27154 invoked from network); 20 Jan 2004 04:50:12 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 20 Jan 2004 04:50:12 -0000 Received: (qmail 65452 invoked by uid 1438); 20 Jan 2004 04:50:32 -0000 Date: 20 Jan 2004 04:50:32 -0000 Message-ID: <20040120045032.65451.qmail@minotaur.apache.org> From: mcconnell@apache.org To: avalon-cvs@apache.org Subject: cvs commit: avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl DefaultContainmentModel.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N mcconnell 2004/01/19 20:50:31 Modified: merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl DefaultContainmentModel.java Log: Correct null check. Revision Changes Path 1.22 +2 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java Index: DefaultContainmentModel.java =================================================================== RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- DefaultContainmentModel.java 19 Jan 2004 21:46:10 -0000 1.21 +++ DefaultContainmentModel.java 20 Jan 2004 04:50:31 -0000 1.22 @@ -950,7 +950,7 @@ synchronized( repository ) { DeploymentModel model = (DeploymentModel) repository.getModel( name ); - if( null == name ) + if( null == model ) { final String error = "No model named [" + name --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org