Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 65514 invoked from network); 12 Jan 2010 12:03:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 12 Jan 2010 12:03:30 -0000 Received: (qmail 5886 invoked by uid 500); 12 Jan 2010 12:03:29 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 5781 invoked by uid 500); 12 Jan 2010 12:03:29 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 5770 invoked by uid 99); 12 Jan 2010 12:03:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2010 12:03:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2010 12:03:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6698023888E8; Tue, 12 Jan 2010 12:03:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r898297 - /tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Date: Tue, 12 Jan 2010 12:03:08 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100112120308.6698023888E8@eris.apache.org> Author: markt Date: Tue Jan 12 12:03:07 2010 New Revision: 898297 URL: http://svn.apache.org/viewvc?rev=898297&view=rev Log: Avoid NPE if bundle is missing Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Modified: tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java?rev=898297&r1=898296&r2=898297&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/res/StringManager.java Tue Jan 12 12:03:07 2010 @@ -109,7 +109,10 @@ String str = null; try { - str = bundle.getString(key); + // Avoid NPE if bundle is null and treat it like an MRE + if (bundle != null) { + str = bundle.getString(key); + } } catch(MissingResourceException mre) { //bad: shouldn't mask an exception the following way: // str = "[cannot find message associated with key '" + key + "' due to " + mre + "]"; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org