Title: [700] trunk/core/src/main/java/org/servicemix/jbi/util/FileUtil.java: Fix possible NPE
- Revision
- 700
- Author
- gnt
- Date
- 2005-10-28 11:03:55 -0400 (Fri, 28 Oct 2005)
Log Message
Fix possible NPE
Modified Paths
Diff
Modified: trunk/core/src/main/java/org/servicemix/jbi/util/FileUtil.java (699 => 700)
--- trunk/core/src/main/java/org/servicemix/jbi/util/FileUtil.java 2005-10-28 14:47:31 UTC (rev 699)
+++ trunk/core/src/main/java/org/servicemix/jbi/util/FileUtil.java 2005-10-28 15:03:55 UTC (rev 700)
@@ -216,15 +216,19 @@
if (fileToDelete != null && fileToDelete.exists()) {
if (fileToDelete.isDirectory()) {
File[] files = fileToDelete.listFiles();
- for (int i = 0; i < files.length; i++) {
- File file = files[i];
- if (!file.getName().equals(".") && !file.getName().equals("..")) {
- if (file.isDirectory()) {
- result &= deleteFile(file);
- }
- result &= file.delete();
- }
- }
+ if (files != null) {
+ result = false;
+ } else {
+ for (int i = 0; i < files.length; i++) {
+ File file = files[i];
+ if (!file.getName().equals(".") && !file.getName().equals("..")) {
+ if (file.isDirectory()) {
+ result &= deleteFile(file);
+ }
+ result &= file.delete();
+ }
+ }
+ }
}
result &= fileToDelete.delete();
if (fileToDelete.exists()) {
