You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fs...@apache.org on 2015/01/27 20:21:25 UTC
svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/servlets/DefaultServlet.java
Author: fschumacher
Date: Tue Jan 27 19:21:25 2015
New Revision: 1655114
URL: http://svn.apache.org/r1655114
Log:
Close the inputstream that was used to get the content of
the readme file. Issue reported by Coverity Scan.
Merged r1654522 from /tomcat/trunk
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 27 19:21:25 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654725,1654735,1654766,1654785
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654725,1654735,1654766,1654785
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Jan 27 19:21:25 2015
@@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
directory.getWebappPath() + readmeFile);
if (resource.isFile()) {
StringWriter buffer = new StringWriter();
- InputStream is = resource.getInputStream();
- copyRange(new InputStreamReader(is),
- new PrintWriter(buffer));
+ try (InputStream is = resource.getInputStream();
+ InputStreamReader reader = new InputStreamReader(is)) {
+ copyRange(reader, new PrintWriter(buffer));
+ } catch (IOException ignored) {
+ }
return buffer.toString();
} else {
if (debug > 10)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/servlets/DefaultServlet.java
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Felix,
On 1/28/15 10:52 AM, Felix Schumacher wrote:
> Am 28.01.2015 15:36, schrieb Christopher Schultz:
>> Felix,
>>
>> On 1/27/15 2:21 PM, fschumacher@apache.org wrote:
>>> Author: fschumacher
>>> Date: Tue Jan 27 19:21:25 2015
>>> New Revision: 1655114
>>>
>>> URL: http://svn.apache.org/r1655114
>>> Log:
>>> Close the inputstream that was used to get the content of
>>> the readme file. Issue reported by Coverity Scan.
>>>
>>> Merged r1654522 from /tomcat/trunk
>>>
>>> Modified:
>>> tomcat/tc8.0.x/trunk/ (props changed)
>>>
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>>
>>>
>>> Propchange: tomcat/tc8.0.x/trunk/
>>> ------------------------------------------------------------------------------
>>>
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Tue Jan 27 19:21:25 2015
>>> @@ -1 +1 @@
>>> -/tomcat
>>>
>>> Modified:
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>>
>>> URL:
>>> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
>>>
>>> ==============================================================================
>>>
>>> ---
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>> (original)
>>> +++
>>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>> Tue Jan 27 19:21:25 2015
>>> @@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
>>> directory.getWebappPath() + readmeFile);
>>> if (resource.isFile()) {
>>> StringWriter buffer = new StringWriter();
>>> - InputStream is = resource.getInputStream();
>>> - copyRange(new InputStreamReader(is),
>>> - new PrintWriter(buffer));
>>> + try (InputStream is = resource.getInputStream();
>>> + InputStreamReader reader = new
>>> InputStreamReader(is)) {
>>> + copyRange(reader, new PrintWriter(buffer));
>>> + } catch (IOException ignored) {
>>> + }
>>
>> I know it seems silly and extra, unnecessary code, but I really dislike
>> swallowing exceptions like this.
> Right, that's why I have added logging in r1655117. I think you will not
> like r1655115 either :)
Thanks!
-chris
Re: svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/servlets/DefaultServlet.java
Posted by Felix Schumacher <fe...@internetallee.de>.
Am 28.01.2015 15:36, schrieb Christopher Schultz:
> Felix,
>
> On 1/27/15 2:21 PM, fschumacher@apache.org wrote:
>> Author: fschumacher
>> Date: Tue Jan 27 19:21:25 2015
>> New Revision: 1655114
>>
>> URL: http://svn.apache.org/r1655114
>> Log:
>> Close the inputstream that was used to get the content of
>> the readme file. Issue reported by Coverity Scan.
>>
>> Merged r1654522 from /tomcat/trunk
>>
>> Modified:
>> tomcat/tc8.0.x/trunk/ (props changed)
>>
>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>>
>> Propchange: tomcat/tc8.0.x/trunk/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Tue Jan 27 19:21:25 2015
>> @@ -1 +1 @@
>> -/tomcat
>>
>> Modified:
>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>> URL:
>> http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
>> ==============================================================================
>> ---
>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>> (original)
>> +++
>> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>> Tue Jan 27 19:21:25 2015
>> @@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
>> directory.getWebappPath() + readmeFile);
>> if (resource.isFile()) {
>> StringWriter buffer = new StringWriter();
>> - InputStream is = resource.getInputStream();
>> - copyRange(new InputStreamReader(is),
>> - new PrintWriter(buffer));
>> + try (InputStream is = resource.getInputStream();
>> + InputStreamReader reader = new
>> InputStreamReader(is)) {
>> + copyRange(reader, new PrintWriter(buffer));
>> + } catch (IOException ignored) {
>> + }
>
> I know it seems silly and extra, unnecessary code, but I really dislike
> swallowing exceptions like this.
Right, that's why I have added logging in r1655117. I think you will not
like r1655115 either :)
Felix
>
> -chris
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1655114 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/servlets/DefaultServlet.java
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Felix,
On 1/27/15 2:21 PM, fschumacher@apache.org wrote:
> Author: fschumacher
> Date: Tue Jan 27 19:21:25 2015
> New Revision: 1655114
>
> URL: http://svn.apache.org/r1655114
> Log:
> Close the inputstream that was used to get the content of
> the readme file. Issue reported by Coverity Scan.
>
> Merged r1654522 from /tomcat/trunk
>
> Modified:
> tomcat/tc8.0.x/trunk/ (props changed)
> tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
>
> Propchange: tomcat/tc8.0.x/trunk/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Tue Jan 27 19:21:25 2015
> @@ -1 +1 @@
> -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489
2
> ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654725,1654735,1654766,1654785
> +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489
2
> ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654725,1654735,1654766,1654785
>
> Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
> URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1655114&r1=1655113&r2=1655114&view=diff
> ==============================================================================
> --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
> +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue Jan 27 19:21:25 2015
> @@ -1538,9 +1538,11 @@ public class DefaultServlet extends Http
> directory.getWebappPath() + readmeFile);
> if (resource.isFile()) {
> StringWriter buffer = new StringWriter();
> - InputStream is = resource.getInputStream();
> - copyRange(new InputStreamReader(is),
> - new PrintWriter(buffer));
> + try (InputStream is = resource.getInputStream();
> + InputStreamReader reader = new InputStreamReader(is)) {
> + copyRange(reader, new PrintWriter(buffer));
> + } catch (IOException ignored) {
> + }
I know it seems silly and extra, unnecessary code, but I really dislike
swallowing exceptions like this.
-chris