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

(-)java/org/apache/catalina/startup/ExpandWar.java (-5 / +11 lines)
Lines 281-291 Link Here
281
        }
281
        }
282
        for (int i = 0; i < files.length; i++) {
282
        for (int i = 0; i < files.length; i++) {
283
            File file = new File(dir, files[i]);
283
            File file = new File(dir, files[i]);
284
            if (file.isDirectory()) {
284
                try {
285
                deleteDir(file);
285
                    if (file.isDirectory()
286
            } else {
286
                            && file.getCanonicalPath().equals(file.getAbsolutePath())) {
287
                file.delete();
287
                        // Directory that is not symbolic link
288
            }
288
                        deleteDir(file);
289
                    } else {
290
                        file.delete();
291
                    }
292
                } catch (IOException e) {
293
                    log.error(sm.getString("expandWar.canonicalizing",file.getAbsolutePath()), e);
294
                }
289
        }
295
        }
290
        return dir.delete();
296
        return dir.delete();

Return to bug 47626