Modified: websites/production/commons/content/proper/commons-fileupload/cobertura/org.apache.commons.fileupload.disk.DiskFileItem.html ============================================================================== --- websites/production/commons/content/proper/commons-fileupload/cobertura/org.apache.commons.fileupload.disk.DiskFileItem.html (original) +++ websites/production/commons/content/proper/commons-fileupload/cobertura/org.apache.commons.fileupload.disk.DiskFileItem.html Tue Jun 13 12:53:17 2017 @@ -12,7 +12,7 @@ <div class="separator"> </div> <table class="report"> <thead><tr> <td class="heading">Classes in this File</td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Line Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Branch Coverage</a></td> <td class="heading"><a class="dfn" href="help.html" onclick="popupwindow('help.html'); return false;">Complexity</a></td></tr></thead> - <tr><td><a href="org.apache.commons.fileupload.disk.DiskFileItem.html">DiskFileItem</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">69%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:69px"><span class="text">78/112</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">28/46</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2,5</td></tr> + <tr><td><a href="org.apache.commons.fileupload.disk.DiskFileItem.html">DiskFileItem</a></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">69%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:69px"><span class="text">78/112</span></div></div></td></tr></table></td><td><table cellpadding="0px" cellspacing="0px" class="percentgraph"><tr class="percentgraph"><td align="right" class="percentgraph" width="40">60%</td><td class="percentgraph"><div class="percentgraph"><div class="greenbar" style="width:60px"><span class="text">28/46</span></div></div></td></tr></table></td><td class="value"><span class="hidden">2.5;</span>2.5</td></tr> </table> <div class="separator"> </div> @@ -174,971 +174,951 @@ <tr> <td class="numLine"> 78</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 79</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The UID to use when serializing this instance.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * Default content charset to be used when no explicit charset</span></pre></td></tr> <tr> <td class="numLine"> 80</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * parameter is provided by the sender. Media subtypes of the</span></pre></td></tr> <tr> <td class="numLine"> 81</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> <span class="keyword">long</span> serialVersionUID = 2237570099615271025L;</pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * "text" type are defined to have a default charset value of</span></pre></td></tr> <tr> <td class="numLine"> 82</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * "ISO-8859-1" when received via HTTP.</span></pre></td></tr> <tr> <td class="numLine"> 83</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 84</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * Default content charset to be used when no explicit charset</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DEFAULT_CHARSET = <span class="string">"ISO-8859-1"</span>;</pre></td></tr> <tr> <td class="numLine"> 85</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * parameter is provided by the sender. Media subtypes of the</span></pre></td></tr> + <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 86</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * "text" type are defined to have a default charset value of</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment">// ----------------------------------------------------------- Data members</span></pre></td></tr> <tr> <td class="numLine"> 87</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * "ISO-8859-1" when received via HTTP.</span></pre></td></tr> + <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 88</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 89</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">static</span> <span class="keyword">final</span> String DEFAULT_CHARSET = <span class="string">"ISO-8859-1"</span>;</pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * UID used in unique file name generation.</span></pre></td></tr> <tr> <td class="numLine"> 90</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 91</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">// ----------------------------------------------------------- Data members</span></pre></td></tr> -<tr> <td class="numLine"> 92</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String UID =</pre></td></tr> +<tr> <td class="numLineCover"> 92</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> UUID.randomUUID().toString().replace(<span class="string">'-'</span>, <span class="string">'_'</span>);</pre></td></tr> <tr> <td class="numLine"> 93</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> + <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 94</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * UID used in unique file name generation.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 95</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * Counter used in unique identifier generation.</span></pre></td></tr> <tr> <td class="numLine"> 96</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> String UID =</pre></td></tr> -<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> UUID.randomUUID().toString().replace(<span class="string">'-'</span>, <span class="string">'_'</span>);</pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> +<tr> <td class="numLineCover"> 97</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AtomicInteger COUNTER = <span class="keyword">new</span> AtomicInteger(0);</pre></td></tr> <tr> <td class="numLine"> 98</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 99</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 100</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * Counter used in unique identifier generation.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The name of the form field as provided by the browser.</span></pre></td></tr> <tr> <td class="numLine"> 101</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLineCover"> 102</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">static</span> <span class="keyword">final</span> AtomicInteger COUNTER = <span class="keyword">new</span> AtomicInteger(0);</pre></td></tr> +<tr> <td class="numLine"> 102</td> <td class="nbHits"> </td> + <td class="src"><pre class="src"> <span class="keyword">private</span> String fieldName;</pre></td></tr> <tr> <td class="numLine"> 103</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 104</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 105</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The name of the form field as provided by the browser.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The content type passed by the browser, or <code>null</code> if</span></pre></td></tr> <tr> <td class="numLine"> 106</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * not defined.</span></pre></td></tr> <tr> <td class="numLine"> 107</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> String fieldName;</pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 108</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String contentType;</pre></td></tr> <tr> <td class="numLine"> 109</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> + <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 110</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The content type passed by the browser, or <code>null</code> if</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 111</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * not defined.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * Whether or not this item is a simple form field.</span></pre></td></tr> <tr> <td class="numLine"> 112</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 113</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String contentType;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> isFormField;</pre></td></tr> <tr> <td class="numLine"> 114</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 115</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 116</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * Whether or not this item is a simple form field.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The original filename in the user's filesystem.</span></pre></td></tr> <tr> <td class="numLine"> 117</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 118</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">boolean</span> isFormField;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String fileName;</pre></td></tr> <tr> <td class="numLine"> 119</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 120</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 121</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The original filename in the user's filesystem.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The size of the item, in bytes. This is used to cache the size when a</span></pre></td></tr> <tr> <td class="numLine"> 122</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * file item is moved from its original location.</span></pre></td></tr> <tr> <td class="numLine"> 123</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> String fileName;</pre></td></tr> -<tr> <td class="numLine"> 124</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> +<tr> <td class="numLineCover"> 124</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> size = -1;</pre></td></tr> <tr> <td class="numLine"> 125</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> + <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 126</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The size of the item, in bytes. This is used to cache the size when a</span></pre></td></tr> + <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 127</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * file item is moved from its original location.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 128</td> <td class="nbHits"> </td> + <td class="src"><pre class="src"> <span class="comment"> * The threshold above which uploads will be stored on disk.</span></pre></td></tr> +<tr> <td class="numLine"> 129</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLineCover"> 129</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">long</span> size = -1;</pre></td></tr> <tr> <td class="numLine"> 130</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">int</span> sizeThreshold;</pre></td></tr> <tr> <td class="numLine"> 131</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 132</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 133</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The threshold above which uploads will be stored on disk.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The directory in which uploaded files will be stored, if stored on disk.</span></pre></td></tr> <tr> <td class="numLine"> 134</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 135</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> <span class="keyword">int</span> sizeThreshold;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> File repository;</pre></td></tr> <tr> <td class="numLine"> 136</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 137</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 138</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The directory in which uploaded files will be stored, if stored on disk.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * Cached contents of the file.</span></pre></td></tr> <tr> <td class="numLine"> 139</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 140</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">final</span> File repository;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">byte</span>[] cachedContent;</pre></td></tr> <tr> <td class="numLine"> 141</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 142</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 143</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * Cached contents of the file.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * Output stream for this item.</span></pre></td></tr> <tr> <td class="numLine"> 144</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 145</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">byte</span>[] cachedContent;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">transient</span> DeferredFileOutputStream dfos;</pre></td></tr> <tr> <td class="numLine"> 146</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 147</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 148</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * Output stream for this item.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The temporary file to use.</span></pre></td></tr> <tr> <td class="numLine"> 149</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 150</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">transient</span> DeferredFileOutputStream dfos;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">transient</span> File tempFile;</pre></td></tr> <tr> <td class="numLine"> 151</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 152</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> <tr> <td class="numLine"> 153</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The temporary file to use.</span></pre></td></tr> + <td class="src"><pre class="src"> <span class="comment"> * The file items headers.</span></pre></td></tr> <tr> <td class="numLine"> 154</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> <tr> <td class="numLine"> 155</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> <span class="keyword">transient</span> File tempFile;</pre></td></tr> + <td class="src"><pre class="src"> <span class="keyword">private</span> FileItemHeaders headers;</pre></td></tr> <tr> <td class="numLine"> 156</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> <tr> <td class="numLine"> 157</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * File to allow for serialization of the content of this item.</span></pre></td></tr> -<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> File dfosFile;</pre></td></tr> -<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> * The file items headers.</span></pre></td></tr> -<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> <span class="keyword">private</span> FileItemHeaders headers;</pre></td></tr> -<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td> - <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">// ----------------------------------------------------------- Constructors</span></pre></td></tr> -<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 158</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 159</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 160</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Constructs a new <code>DiskFileItem</code> instance.</span></pre></td></tr> -<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 161</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 162</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param fieldName The name of the form field.</span></pre></td></tr> -<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 163</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param contentType The content type passed by the browser or</span></pre></td></tr> -<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 164</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * <code>null</code> if not specified.</span></pre></td></tr> -<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 165</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param isFormField Whether or not this item is a plain form field, as</span></pre></td></tr> -<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 166</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * opposed to a file upload.</span></pre></td></tr> -<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 167</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param fileName The original filename in the user's filesystem, or</span></pre></td></tr> -<tr> <td class="numLine"> 178</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 168</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * <code>null</code> if not specified.</span></pre></td></tr> -<tr> <td class="numLine"> 179</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 169</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param sizeThreshold The threshold, in bytes, below which items will be</span></pre></td></tr> -<tr> <td class="numLine"> 180</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 170</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * retained in memory and above which they will be</span></pre></td></tr> -<tr> <td class="numLine"> 181</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 171</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * stored as a file.</span></pre></td></tr> -<tr> <td class="numLine"> 182</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 172</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param repository The data repository, which is the directory in</span></pre></td></tr> -<tr> <td class="numLine"> 183</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 173</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * which files will be created, should the item size</span></pre></td></tr> -<tr> <td class="numLine"> 184</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 174</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * exceed the threshold.</span></pre></td></tr> -<tr> <td class="numLine"> 185</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 175</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 176</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> DiskFileItem(String fieldName,</pre></td></tr> -<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 177</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> String contentType, <span class="keyword">boolean</span> isFormField, String fileName,</pre></td></tr> -<tr> <td class="numLineCover"> 188</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">int</span> sizeThreshold, File repository) {</pre></td></tr> -<tr> <td class="numLineCover"> 189</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fieldName = fieldName;</pre></td></tr> -<tr> <td class="numLineCover"> 190</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.contentType = contentType;</pre></td></tr> -<tr> <td class="numLineCover"> 191</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.isFormField = isFormField;</pre></td></tr> -<tr> <td class="numLineCover"> 192</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileName = fileName;</pre></td></tr> -<tr> <td class="numLineCover"> 193</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.sizeThreshold = sizeThreshold;</pre></td></tr> -<tr> <td class="numLineCover"> 194</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.repository = repository;</pre></td></tr> -<tr> <td class="numLineCover"> 195</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 178</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">int</span> sizeThreshold, File repository) {</pre></td></tr> +<tr> <td class="numLineCover"> 179</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fieldName = fieldName;</pre></td></tr> +<tr> <td class="numLineCover"> 180</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.contentType = contentType;</pre></td></tr> +<tr> <td class="numLineCover"> 181</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.isFormField = isFormField;</pre></td></tr> +<tr> <td class="numLineCover"> 182</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.fileName = fileName;</pre></td></tr> +<tr> <td class="numLineCover"> 183</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.sizeThreshold = sizeThreshold;</pre></td></tr> +<tr> <td class="numLineCover"> 184</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">this</span>.repository = repository;</pre></td></tr> +<tr> <td class="numLineCover"> 185</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> }</pre></td></tr> +<tr> <td class="numLine"> 186</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 187</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">// ------------------------------- Methods from javax.activation.DataSource</span></pre></td></tr> -<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 188</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 189</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 200</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 190</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns an {@link java.io.InputStream InputStream} that can be</span></pre></td></tr> -<tr> <td class="numLine"> 201</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 191</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * used to retrieve the contents of the file.</span></pre></td></tr> -<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 192</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 193</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return An {@link java.io.InputStream InputStream} that can be</span></pre></td></tr> -<tr> <td class="numLine"> 204</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 194</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * used to retrieve the contents of the file.</span></pre></td></tr> -<tr> <td class="numLine"> 205</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 195</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 196</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @throws IOException if an error occurs.</span></pre></td></tr> -<tr> <td class="numLine"> 207</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 197</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 198</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> InputStream getInputStream()</pre></td></tr> -<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 199</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">throws</span> IOException {</pre></td></tr> -<tr> <td class="numLineCover"> 210</td> <td class="nbHitsUncovered"><a title="Line 210: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 210: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!isInMemory()) {</a></span></pre></td></tr> -<tr> <td class="numLineCover"> 211</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> FileInputStream(dfos.getFile());</span></pre></td></tr> -<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 200</td> <td class="nbHitsUncovered"><a title="Line 200: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 200: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (!isInMemory()) {</a></span></pre></td></tr> +<tr> <td class="numLineCover"> 201</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> FileInputStream(dfos.getFile());</span></pre></td></tr> +<tr> <td class="numLine"> 202</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 203</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLineCover"> 214</td> <td class="nbHitsUncovered"><a title="Line 214: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 214: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cachedContent == <span class="keyword">null</span>) {</a></span></pre></td></tr> -<tr> <td class="numLineCover"> 215</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cachedContent = dfos.getData();</span></pre></td></tr> -<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 204</td> <td class="nbHitsUncovered"><a title="Line 204: Conditional coverage 0% (0/2)."> 0</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 204: Conditional coverage 0% (0/2)."> <span class="keyword">if</span> (cachedContent == <span class="keyword">null</span>) {</a></span></pre></td></tr> +<tr> <td class="numLineCover"> 205</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> cachedContent = dfos.getData();</span></pre></td></tr> +<tr> <td class="numLine"> 206</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLineCover"> 217</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> ByteArrayInputStream(cachedContent);</span></pre></td></tr> -<tr> <td class="numLine"> 218</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 207</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> ByteArrayInputStream(cachedContent);</span></pre></td></tr> +<tr> <td class="numLine"> 208</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 209</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 210</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 211</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the content type passed by the agent or <code>null</code> if</span></pre></td></tr> -<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 212</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * not defined.</span></pre></td></tr> -<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 213</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 214</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The content type passed by the agent or <code>null</code> if</span></pre></td></tr> -<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 215</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * not defined.</span></pre></td></tr> -<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 216</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 217</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> String getContentType() {</pre></td></tr> -<tr> <td class="numLineCover"> 228</td> <td class="nbHitsCovered"> 23</td> <td class="src"><pre class="src"> <span class="keyword">return</span> contentType;</pre></td></tr> -<tr> <td class="numLine"> 229</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 218</td> <td class="nbHitsCovered"> 23</td> <td class="src"><pre class="src"> <span class="keyword">return</span> contentType;</pre></td></tr> +<tr> <td class="numLine"> 219</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 230</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 220</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 221</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 232</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 222</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the content charset passed by the agent or <code>null</code> if</span></pre></td></tr> -<tr> <td class="numLine"> 233</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 223</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * not defined.</span></pre></td></tr> -<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 224</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 225</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The content charset passed by the agent or <code>null</code> if</span></pre></td></tr> -<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 226</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * not defined.</span></pre></td></tr> -<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 227</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 228</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> String getCharSet() {</pre></td></tr> -<tr> <td class="numLineCover"> 239</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> ParameterParser parser = <span class="keyword">new</span> ParameterParser();</pre></td></tr> -<tr> <td class="numLineCover"> 240</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> parser.setLowerCaseNames(<span class="keyword">true</span>);</pre></td></tr> -<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 229</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> ParameterParser parser = <span class="keyword">new</span> ParameterParser();</pre></td></tr> +<tr> <td class="numLineCover"> 230</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> parser.setLowerCaseNames(<span class="keyword">true</span>);</pre></td></tr> +<tr> <td class="numLine"> 231</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">// Parameter parser can handle null input</span></pre></td></tr> -<tr> <td class="numLineCover"> 242</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> Map<String, String> params = parser.parse(getContentType(), <span class="string">';'</span>);</pre></td></tr> -<tr> <td class="numLineCover"> 243</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">return</span> params.get(<span class="string">"charset"</span>);</pre></td></tr> -<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 232</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> Map<String, String> params = parser.parse(getContentType(), <span class="string">';'</span>);</pre></td></tr> +<tr> <td class="numLineCover"> 233</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">return</span> params.get(<span class="string">"charset"</span>);</pre></td></tr> +<tr> <td class="numLine"> 234</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 235</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 246</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 236</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 237</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the original filename in the client's filesystem.</span></pre></td></tr> -<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 238</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 239</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The original filename in the client's filesystem.</span></pre></td></tr> -<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 240</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @throws org.apache.commons.fileupload.InvalidFileNameException The file name contains a NUL character,</span></pre></td></tr> -<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 241</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * which might be an indicator of a security attack. If you intend to</span></pre></td></tr> -<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 242</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * use the file name anyways, catch the exception and use</span></pre></td></tr> -<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 243</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * {@link org.apache.commons.fileupload.InvalidFileNameException#getName()}.</span></pre></td></tr> -<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 244</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 245</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> String getName() {</pre></td></tr> -<tr> <td class="numLineCover"> 256</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Streams.checkFileName(fileName);</pre></td></tr> -<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 246</td> <td class="nbHitsCovered"> 11</td> <td class="src"><pre class="src"> <span class="keyword">return</span> Streams.checkFileName(fileName);</pre></td></tr> +<tr> <td class="numLine"> 247</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 248</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 259</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 249</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">// ------------------------------------------------------- FileItem methods</span></pre></td></tr> -<tr> <td class="numLine"> 260</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 250</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 251</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 262</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 252</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Provides a hint as to whether or not the file contents will be read</span></pre></td></tr> -<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 253</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * from memory.</span></pre></td></tr> -<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 254</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 255</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return <code>true</code> if the file contents will be read</span></pre></td></tr> -<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 256</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * from memory; <code>false</code> otherwise.</span></pre></td></tr> -<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 257</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 258</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">boolean</span> isInMemory() {</pre></td></tr> -<tr> <td class="numLineCover"> 269</td> <td class="nbHitsCovered"><a title="Line 269: Conditional coverage 100% (2/2)."> 2147</a></td> <td class="src"><pre class="src"> <a title="Line 269: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (cachedContent != <span class="keyword">null</span>) {</a></pre></td></tr> -<tr> <td class="numLineCover"> 270</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr> -<tr> <td class="numLine"> 271</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 259</td> <td class="nbHitsCovered"><a title="Line 259: Conditional coverage 100% (2/2)."> 2147</a></td> <td class="src"><pre class="src"> <a title="Line 259: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (cachedContent != <span class="keyword">null</span>) {</a></pre></td></tr> +<tr> <td class="numLineCover"> 260</td> <td class="nbHitsCovered"> 1</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">true</span>;</pre></td></tr> +<tr> <td class="numLine"> 261</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLineCover"> 272</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dfos.isInMemory();</pre></td></tr> -<tr> <td class="numLine"> 273</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 262</td> <td class="nbHitsCovered"> 2146</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dfos.isInMemory();</pre></td></tr> +<tr> <td class="numLine"> 263</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 274</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 264</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 275</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 265</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 276</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 266</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the size of the file.</span></pre></td></tr> -<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 267</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 278</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 268</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The size of the file, in bytes.</span></pre></td></tr> -<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 269</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 270</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">long</span> getSize() {</pre></td></tr> -<tr> <td class="numLineCover"> 281</td> <td class="nbHitsUncovered"><a title="Line 281: Conditional coverage 50% (1/2)."> 536</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 281: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (size >= 0) {</a></span></pre></td></tr> -<tr> <td class="numLineCover"> 282</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> size;</span></pre></td></tr> -<tr> <td class="numLineCover"> 283</td> <td class="nbHitsUncovered"><a title="Line 283: Conditional coverage 50% (1/2)."> 536</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 283: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (cachedContent != <span class="keyword">null</span>) {</a></span></pre></td></tr> -<tr> <td class="numLineCover"> 284</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> cachedContent.length;</span></pre></td></tr> -<tr> <td class="numLineCover"> 285</td> <td class="nbHitsCovered"><a title="Line 285: Conditional coverage 100% (2/2)."> 536</a></td> <td class="src"><pre class="src"> <a title="Line 285: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (dfos.isInMemory()) {</a></pre></td></tr> -<tr> <td class="numLineCover"> 286</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dfos.getData().length;</pre></td></tr> -<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 271</td> <td class="nbHitsUncovered"><a title="Line 271: Conditional coverage 50% (1/2)."> 536</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 271: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (size >= 0) {</a></span></pre></td></tr> +<tr> <td class="numLineCover"> 272</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> size;</span></pre></td></tr> +<tr> <td class="numLineCover"> 273</td> <td class="nbHitsUncovered"><a title="Line 273: Conditional coverage 50% (1/2)."> 536</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 273: Conditional coverage 50% (1/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (cachedContent != <span class="keyword">null</span>) {</a></span></pre></td></tr> +<tr> <td class="numLineCover"> 274</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> cachedContent.length;</span></pre></td></tr> +<tr> <td class="numLineCover"> 275</td> <td class="nbHitsCovered"><a title="Line 275: Conditional coverage 100% (2/2)."> 536</a></td> <td class="src"><pre class="src"> <a title="Line 275: Conditional coverage 100% (2/2)."> } <span class="keyword">else</span> <span class="keyword">if</span> (dfos.isInMemory()) {</a></pre></td></tr> +<tr> <td class="numLineCover"> 276</td> <td class="nbHitsCovered"> 4</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dfos.getData().length;</pre></td></tr> +<tr> <td class="numLine"> 277</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> } <span class="keyword">else</span> {</pre></td></tr> -<tr> <td class="numLineCover"> 288</td> <td class="nbHitsCovered"> 532</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dfos.getFile().length();</pre></td></tr> -<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 278</td> <td class="nbHitsCovered"> 532</td> <td class="src"><pre class="src"> <span class="keyword">return</span> dfos.getFile().length();</pre></td></tr> +<tr> <td class="numLine"> 279</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 280</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 291</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 281</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 292</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 282</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 293</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 283</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the contents of the file as an array of bytes. If the</span></pre></td></tr> -<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 284</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * contents of the file were not yet cached in memory, they will be</span></pre></td></tr> -<tr> <td class="numLine"> 295</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 285</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * loaded from the disk storage and cached.</span></pre></td></tr> -<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 286</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 287</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The contents of the file as an array of bytes</span></pre></td></tr> -<tr> <td class="numLine"> 298</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 288</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * or {@code null} if the data cannot be read</span></pre></td></tr> -<tr> <td class="numLine"> 299</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 289</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 290</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> <span class="keyword">byte</span>[] get() {</pre></td></tr> -<tr> <td class="numLineCover"> 301</td> <td class="nbHitsCovered"><a title="Line 301: Conditional coverage 100% (2/2)."> 1431</a></td> <td class="src"><pre class="src"> <a title="Line 301: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isInMemory()) {</a></pre></td></tr> -<tr> <td class="numLineCover"> 302</td> <td class="nbHitsUncovered"><a title="Line 302: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 902</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 302: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (cachedContent == <span class="keyword">null</span> && dfos != <span class="keyword">null</span>) {</a></span></pre></td></tr> -<tr> <td class="numLineCover"> 303</td> <td class="nbHitsCovered"> 901</td> <td class="src"><pre class="src"> cachedContent = dfos.getData();</pre></td></tr> -<tr> <td class="numLine"> 304</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 291</td> <td class="nbHitsCovered"><a title="Line 291: Conditional coverage 100% (2/2)."> 1431</a></td> <td class="src"><pre class="src"> <a title="Line 291: Conditional coverage 100% (2/2)."> <span class="keyword">if</span> (isInMemory()) {</a></pre></td></tr> +<tr> <td class="numLineCover"> 292</td> <td class="nbHitsUncovered"><a title="Line 292: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> 902</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 292: Conditional coverage 75% (3/4) [each condition: 100%, 50%]."> <span class="keyword">if</span> (cachedContent == <span class="keyword">null</span> && dfos != <span class="keyword">null</span>) {</a></span></pre></td></tr> +<tr> <td class="numLineCover"> 293</td> <td class="nbHitsCovered"> 901</td> <td class="src"><pre class="src"> cachedContent = dfos.getData();</pre></td></tr> +<tr> <td class="numLine"> 294</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLineCover"> 305</td> <td class="nbHitsCovered"> 902</td> <td class="src"><pre class="src"> <span class="keyword">return</span> cachedContent;</pre></td></tr> -<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 295</td> <td class="nbHitsCovered"> 902</td> <td class="src"><pre class="src"> <span class="keyword">return</span> cachedContent;</pre></td></tr> +<tr> <td class="numLine"> 296</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 307</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 297</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] fileData = <span class="keyword">new</span> <span class="keyword">byte</span>[(<span class="keyword">int</span>) getSize()];</pre></td></tr> -<tr> <td class="numLineCover"> 309</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> InputStream fis = <span class="keyword">null</span>;</pre></td></tr> -<tr> <td class="numLine"> 310</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 298</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] fileData = <span class="keyword">new</span> <span class="keyword">byte</span>[(<span class="keyword">int</span>) getSize()];</pre></td></tr> +<tr> <td class="numLineCover"> 299</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> InputStream fis = <span class="keyword">null</span>;</pre></td></tr> +<tr> <td class="numLine"> 300</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 301</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr> -<tr> <td class="numLineCover"> 312</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> fis = <span class="keyword">new</span> FileInputStream(dfos.getFile());</pre></td></tr> -<tr> <td class="numLineCover"> 313</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> IOUtils.readFully(fis, fileData);</pre></td></tr> -<tr> <td class="numLineCover"> 314</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException e) {</span></pre></td></tr> -<tr> <td class="numLineCover"> 315</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileData = <span class="keyword">null</span>;</span></pre></td></tr> -<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 302</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> fis = <span class="keyword">new</span> FileInputStream(dfos.getFile());</pre></td></tr> +<tr> <td class="numLineCover"> 303</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> IOUtils.readFully(fis, fileData);</pre></td></tr> +<tr> <td class="numLineCover"> 304</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (IOException e) {</span></pre></td></tr> +<tr> <td class="numLineCover"> 305</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> fileData = <span class="keyword">null</span>;</span></pre></td></tr> +<tr> <td class="numLine"> 306</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> } <span class="keyword">finally</span> {</pre></td></tr> -<tr> <td class="numLineCover"> 317</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> IOUtils.closeQuietly(fis);</pre></td></tr> -<tr> <td class="numLineCover"> 318</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 307</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> IOUtils.closeQuietly(fis);</pre></td></tr> +<tr> <td class="numLineCover"> 308</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> }</pre></td></tr> +<tr> <td class="numLine"> 309</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLineCover"> 320</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> <span class="keyword">return</span> fileData;</pre></td></tr> -<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 310</td> <td class="nbHitsCovered"> 529</td> <td class="src"><pre class="src"> <span class="keyword">return</span> fileData;</pre></td></tr> +<tr> <td class="numLine"> 311</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 312</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 313</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 314</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the contents of the file as a String, using the specified</span></pre></td></tr> -<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 315</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * encoding. This method uses {@link #get()} to retrieve the</span></pre></td></tr> -<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 316</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * contents of the file.</span></pre></td></tr> -<tr> <td class="numLine"> 327</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 317</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 318</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @param charset The charset to use.</span></pre></td></tr> -<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 319</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 320</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The contents of the file, as a string.</span></pre></td></tr> -<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 321</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 322</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @throws UnsupportedEncodingException if the requested character</span></pre></td></tr> -<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 323</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * encoding is not available.</span></pre></td></tr> -<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 324</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 325</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> String getString(<span class="keyword">final</span> String charset)</pre></td></tr> -<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 326</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">throws</span> UnsupportedEncodingException {</pre></td></tr> -<tr> <td class="numLineCover"> 337</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> String(get(), charset);</span></pre></td></tr> -<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 327</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> String(get(), charset);</span></pre></td></tr> +<tr> <td class="numLine"> 328</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 329</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 340</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 330</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 341</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 331</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * Returns the contents of the file as a String, using the default</span></pre></td></tr> -<tr> <td class="numLine"> 342</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 332</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * character encoding. This method uses {@link #get()} to retrieve the</span></pre></td></tr> -<tr> <td class="numLine"> 343</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 333</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * contents of the file.</span></pre></td></tr> -<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 334</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 335</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * <b>TODO</b> Consider making this method throw UnsupportedEncodingException.</span></pre></td></tr> -<tr> <td class="numLine"> 346</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 336</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> *</span></pre></td></tr> -<tr> <td class="numLine"> 347</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 337</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> * @return The contents of the file, as a string.</span></pre></td></tr> -<tr> <td class="numLine"> 348</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 338</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment"> */</span></pre></td></tr> -<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 339</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">public</span> String getString() {</pre></td></tr> -<tr> <td class="numLineCover"> 350</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] rawdata = get();</pre></td></tr> -<tr> <td class="numLineCover"> 351</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> String charset = getCharSet();</pre></td></tr> -<tr> <td class="numLineCover"> 352</td> <td class="nbHitsUncovered"><a title="Line 352: Conditional coverage 50% (1/2)."> 18</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 352: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (charset == <span class="keyword">null</span>) {</a></span></pre></td></tr> -<tr> <td class="numLineCover"> 353</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> charset = DEFAULT_CHARSET;</pre></td></tr> -<tr> <td class="numLine"> 354</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 340</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">byte</span>[] rawdata = get();</pre></td></tr> +<tr> <td class="numLineCover"> 341</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> String charset = getCharSet();</pre></td></tr> +<tr> <td class="numLineCover"> 342</td> <td class="nbHitsUncovered"><a title="Line 342: Conditional coverage 50% (1/2)."> 18</a></td> <td class="src"><pre class="src"><span class="srcUncovered"> <a title="Line 342: Conditional coverage 50% (1/2)."> <span class="keyword">if</span> (charset == <span class="keyword">null</span>) {</a></span></pre></td></tr> +<tr> <td class="numLineCover"> 343</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> charset = DEFAULT_CHARSET;</pre></td></tr> +<tr> <td class="numLine"> 344</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 355</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 345</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="keyword">try</span> {</pre></td></tr> -<tr> <td class="numLineCover"> 356</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> String(rawdata, charset);</pre></td></tr> -<tr> <td class="numLineCover"> 357</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException e) {</span></pre></td></tr> -<tr> <td class="numLineCover"> 358</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> String(rawdata);</span></pre></td></tr> -<tr> <td class="numLine"> 359</td> <td class="nbHits"> </td> +<tr> <td class="numLineCover"> 346</td> <td class="nbHitsCovered"> 18</td> <td class="src"><pre class="src"> <span class="keyword">return</span> <span class="keyword">new</span> String(rawdata, charset);</pre></td></tr> +<tr> <td class="numLineCover"> 347</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> } <span class="keyword">catch</span> (UnsupportedEncodingException e) {</span></pre></td></tr> +<tr> <td class="numLineCover"> 348</td> <td class="nbHitsUncovered"> 0</td> <td class="src"><pre class="src"><span class="srcUncovered"> <span class="keyword">return</span> <span class="keyword">new</span> String(rawdata);</span></pre></td></tr> +<tr> <td class="numLine"> 349</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 360</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 350</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> }</pre></td></tr> -<tr> <td class="numLine"> 361</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 351</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> </pre></td></tr> -<tr> <td class="numLine"> 362</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 352</td> <td class="nbHits"> </td> <td class="src"><pre class="src"> <span class="comment">/**</span></pre></td></tr> -<tr> <td class="numLine"> 363</td> <td class="nbHits"> </td> +<tr> <td class="numLine"> 353</td> <td class="nbHits"> </td>
[... 710 lines stripped ...]