Return-Path: Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: (qmail 74882 invoked from network); 8 Apr 2010 08:18:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 8 Apr 2010 08:18:50 -0000 Received: (qmail 39125 invoked by uid 500); 8 Apr 2010 08:18:50 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 38898 invoked by uid 500); 8 Apr 2010 08:18:48 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 38890 invoked by uid 99); 8 Apr 2010 08:18:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Apr 2010 08:18:47 +0000 X-ASF-Spam-Status: No, hits=-1394.8 required=10.0 tests=ALL_TRUSTED,AWL 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; Thu, 08 Apr 2010 08:18:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 54152238899B; Thu, 8 Apr 2010 08:18:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r931828 - /struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java Date: Thu, 08 Apr 2010 08:18:26 -0000 To: commits@struts.apache.org From: lukaszlenart@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100408081826.54152238899B@eris.apache.org> Author: lukaszlenart Date: Thu Apr 8 08:18:25 2010 New Revision: 931828 URL: http://svn.apache.org/viewvc?rev=931828&view=rev Log: Improved log message Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java Modified: struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java?rev=931828&r1=931827&r2=931828&view=diff ============================================================================== --- struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java (original) +++ struts/struts2/trunk/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java Thu Apr 8 08:18:25 2010 @@ -25,9 +25,12 @@ import com.opensymphony.module.sitemesh. import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.logging.LoggerFactory; import freemarker.core.InvalidReferenceException; -import freemarker.ext.jsp.TaglibFactory; -import freemarker.ext.servlet.*; -import freemarker.template.*; +import freemarker.template.Configuration; +import freemarker.template.ObjectWrapper; +import freemarker.template.SimpleHash; +import freemarker.template.Template; +import freemarker.template.TemplateException; +import freemarker.template.TemplateModel; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.Dispatcher; @@ -40,14 +43,10 @@ import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.FileNotFoundException; import java.io.IOException; import java.io.StringWriter; -import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Enumeration; -import java.util.GregorianCalendar; import java.util.Locale; /** @@ -195,7 +194,7 @@ public class FreemarkerDecoratorServlet StringBuilder msgBuf = new StringBuilder("Error applying freemarker template to\n request: "); msgBuf.append(req.getRequestURL()); - if (req.getQueryString() == null) msgBuf.append("?").append(req.getQueryString()); + if (req.getQueryString() != null) msgBuf.append("?").append(req.getQueryString()); msgBuf.append(" with resultCode: ").append(resultCode).append(".\n\n").append(x.getMessage()); String msg = msgBuf.toString(); LOG.error(msg, x);