Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 77772 invoked from network); 25 Jul 2005 06:00:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Jul 2005 06:00:31 -0000 Received: (qmail 19683 invoked by uid 500); 25 Jul 2005 06:00:27 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 19142 invoked by uid 500); 25 Jul 2005 06:00:25 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 19129 invoked by uid 500); 25 Jul 2005 06:00:25 -0000 Received: (qmail 19126 invoked by uid 99); 25 Jul 2005 06:00:25 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 24 Jul 2005 23:00:14 -0700 Received: (qmail 77546 invoked by uid 65534); 25 Jul 2005 06:00:11 -0000 Message-ID: <20050725060011.77544.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r224697 - /jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java Date: Mon, 25 Jul 2005 06:00:10 -0000 To: commons-cvs@jakarta.apache.org From: jmitchell@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmitchell Date: Sun Jul 24 23:00:03 2005 New Revision: 224697 URL: http://svn.apache.org/viewcvs?rev=224697&view=rev Log: force getMessages() to honor the resource returnNull setting - Bug 17650 (Steve Peterson) Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java Modified: jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java?rev=224697&r1=224696&r2=224697&view=diff ============================================================================== --- jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java (original) +++ jakarta/commons/proper/resources/trunk/src/java/org/apache/commons/resources/Messages.java Sun Jul 24 23:00:03 2005 @@ -224,7 +224,7 @@ log.debug("Failed retrieving message for key: '" + key + "'.", e); } - if (message == null) { + if (message == null && !resources.isReturnNull()) { message = "???" + key + "???"; } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org