From: Tom Pantelis <tompantelis@gmail.com>
Date: Fri, 8 Jun 2018 13:34:19 +0000 (-0400)
Subject: Improve FilesystemSchemaSourceCache mkdirs handling
X-Git-Tag: v2.0.6~1
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6e1d563831124db6b87dc50d543187f6b18224f1;p=yangtools.git

Improve FilesystemSchemaSourceCache mkdirs handling

mkdirs returns false if the directory already exists. Although
it check exists prior to mkdirs, it's possible for the dir to be
created by another thread in between the calls so make it robust
by checking isDirectory (which also checks exists) if mkdirs returns
false.

Change-Id: If63a2d20400c3093f0aea4c22192fa0e01fde748
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java
index 315152b05c..0e44a34cae 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java
@@ -71,11 +71,8 @@ public final class FilesystemSchemaSourceCache<T extends SchemaSourceRepresentat
 
         checkSupportedRepresentation(representation);
 
-        if (!storageDirectory.exists()) {
-            checkArgument(storageDirectory.mkdirs(), "Unable to create cache directory at %s", storageDirectory);
-        }
-        checkArgument(storageDirectory.exists());
-        checkArgument(storageDirectory.isDirectory());
+        checkArgument(storageDirectory.mkdirs() || storageDirectory.isDirectory(),
+                "Unable to create cache directory at %s", storageDirectory);
         checkArgument(storageDirectory.canWrite());
         checkArgument(storageDirectory.canRead());