View | Details | Raw Unified | Return to bug 33636
Collapse All | Expand All

(-)jakarta-tomcat-5.5.7-src/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ExpandWar.java (-2 / +8 lines)
Lines 148-154 Link Here
148
                    continue;
148
                    continue;
149
                }
149
                }
150
                input = jarFile.getInputStream(jarEntry);
150
                input = jarFile.getInputStream(jarEntry);
151
                expand(input, docBase, name);
151
                File f = expand(input, docBase, name);
152
                long lastModified = jarEntry.getTime();
153
                if (lastModified != -1  &&  lastModified != 0) {
154
                    f.setLastModified(lastModified);
155
                }
152
                input.close();
156
                input.close();
153
                input = null;
157
                input = null;
154
            }
158
            }
Lines 303-312 Link Here
303
     * @param input InputStream to be copied
307
     * @param input InputStream to be copied
304
     * @param docBase Document base directory into which we are expanding
308
     * @param docBase Document base directory into which we are expanding
305
     * @param name Relative pathname of the file to be created
309
     * @param name Relative pathname of the file to be created
310
     * @return File, which has been created.
306
     *
311
     *
307
     * @exception IOException if an input/output error occurs
312
     * @exception IOException if an input/output error occurs
308
     */
313
     */
309
    protected static void expand(InputStream input, File docBase, String name)
314
    protected static File expand(InputStream input, File docBase, String name)
310
        throws IOException {
315
        throws IOException {
311
316
312
        File file = new File(docBase, name);
317
        File file = new File(docBase, name);
Lines 331-336 Link Here
331
            }
336
            }
332
        }
337
        }
333
338
339
        return file;
334
    }
340
    }
335
341
336
342

Return to bug 33636