From 2f3e36405a65435652f1ff9cb1644db50e9c177d Mon Sep 17 00:00:00 2001 From: shekhar-s Date: Thu, 31 Aug 2017 02:10:37 -0600 Subject: [PATCH] Moved article code to libraries, added a null check and reverted change to core-java pom.xml (#2530) --- core-java/pom.xml | 8 -------- .../java/io/JavaDirectoryDeleteUnitTest.java | 14 ++++++++------ 2 files changed, 8 insertions(+), 14 deletions(-) rename {core-java/src/test/java/org => libraries/src/test/java/com}/baeldung/java/io/JavaDirectoryDeleteUnitTest.java (92%) diff --git a/core-java/pom.xml b/core-java/pom.xml index 7920566a1a..633656857e 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -162,12 +162,6 @@ ${avaitility.version} test - - org.springframework - spring-core - ${spring-core.version} - test - commons-codec @@ -433,8 +427,6 @@ 2.8.9 3.6.1 1.7.0 - 4.3.10.RELEASE - 3.6.0 diff --git a/core-java/src/test/java/org/baeldung/java/io/JavaDirectoryDeleteUnitTest.java b/libraries/src/test/java/com/baeldung/java/io/JavaDirectoryDeleteUnitTest.java similarity index 92% rename from core-java/src/test/java/org/baeldung/java/io/JavaDirectoryDeleteUnitTest.java rename to libraries/src/test/java/com/baeldung/java/io/JavaDirectoryDeleteUnitTest.java index b1f800eef3..0820a2b2bd 100644 --- a/core-java/src/test/java/org/baeldung/java/io/JavaDirectoryDeleteUnitTest.java +++ b/libraries/src/test/java/com/baeldung/java/io/JavaDirectoryDeleteUnitTest.java @@ -1,4 +1,4 @@ -package org.baeldung.java.io; +package com.baeldung.java.io; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -68,11 +68,13 @@ public class JavaDirectoryDeleteUnitTest { boolean deleteDirectory(File directoryToBeDeleted) { File[] allContents = directoryToBeDeleted.listFiles(); - for (File file : allContents) { - if (file.isDirectory()) { - deleteDirectory(file); - } else { - file.delete(); + if (allContents != null) { + for (File file : allContents) { + if (file.isDirectory()) { + deleteDirectory(file); + } else { + file.delete(); + } } }