Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 12032 invoked from network); 21 Jun 2007 21:05:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jun 2007 21:05:21 -0000 Received: (qmail 32524 invoked by uid 500); 21 Jun 2007 21:05:25 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 32497 invoked by uid 500); 21 Jun 2007 21:05:25 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 32488 invoked by uid 99); 21 Jun 2007 21:05:25 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2007 14:05:25 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jun 2007 14:05:21 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BF05D1A981A; Thu, 21 Jun 2007 14:05:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r549613 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Date: Thu, 21 Jun 2007 21:05:00 -0000 To: commits@roller.apache.org From: agilliland@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070621210500.BF05D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: agilliland Date: Thu Jun 21 14:04:58 2007 New Revision: 549613 URL: http://svn.apache.org/viewvc?view=rev&rev=549613 Log: feed servlet also needs to do validation before forcing a request locale on entries not 'showing all langs'. Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=549613&r1=549612&r2=549613 ============================================================================== --- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java (original) +++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java Thu Jun 21 14:04:58 2007 @@ -171,11 +171,6 @@ } - // do we need to force a specific locale for the request? - if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) { - feedRequest.setLocale(weblog.getLocale()); - } - // validation. make sure that request input makes sense. boolean invalid = false; if(feedRequest.getLocale() != null) { @@ -210,6 +205,11 @@ return; } + + // do we need to force a specific locale for the request? + if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) { + feedRequest.setLocale(weblog.getLocale()); + } // looks like we need to render content HashMap model = new HashMap();