Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 13130 invoked from network); 2 Dec 2009 01:49:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Dec 2009 01:49:30 -0000 Received: (qmail 54337 invoked by uid 500); 2 Dec 2009 01:49:29 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 54248 invoked by uid 500); 2 Dec 2009 01:49:29 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 54239 invoked by uid 99); 2 Dec 2009 01:49:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Dec 2009 01:49: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; Wed, 02 Dec 2009 01:49:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1F14B23889ED; Wed, 2 Dec 2009 01:49:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r886032 - /myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java Date: Wed, 02 Dec 2009 01:49:05 -0000 To: commits@myfaces.apache.org From: jwaldman@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091202014906.1F14B23889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jwaldman Date: Wed Dec 2 01:49:05 2009 New Revision: 886032 URL: http://svn.apache.org/viewvc?rev=886032&view=rev Log: TRINIDAD-1629 ResourceServlet.java._setHeaders() can call response.setContentType() with a null contentType resulting in an NPE on Websphere. minor code fix to previous checkin. thanks Gary Kind Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java?rev=886032&r1=886031&r2=886032&view=diff ============================================================================== --- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java (original) +++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java Wed Dec 2 01:49:05 2009 @@ -436,6 +436,16 @@ contentType = "image/vnd.microsoft.icon"; else contentType = getServletContext().getMimeType(resourcePath); + + // The resource has an file extension we have not + // included in the case statement above + if (contentType == null) + { + _LOG.warning("ResourceServlet._setHeaders(): " + + "Content type for {0} is NULL!\n" + + "Cause: Unknown file extension", + resourcePath); + } } if (contentType != null) @@ -446,18 +456,6 @@ if (contentLength >= 0) response.setContentLength(contentLength); } - else - { - // The resource has an file extension we have not - // included in the case statement above - url = connection.getURL(); - resourcePath = url.getPath(); - - _LOG.warning("ResourceServlet._setHeaders(): " + - "Content type for {0} is NULL!\n" + - "Cause: Unknown file extension", - resourcePath); - } long lastModified; try