From 97eca944a0fe9ed8620f86d4e76415eb97786b45 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Thu, 8 Sep 2011 08:58:04 +0000
Subject: [PATCH] LMS-2499 avoid NPE when store folder cannot be accessed
SVN: 22829
---
.../dss/generic/shared/utils/SegmentedStoreUtils.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
index 9f785b36ffc..4c25fe711c6 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtils.java
@@ -94,6 +94,11 @@ public class SegmentedStoreUtils
public static File[] getShares(File storeRootDir)
{
File[] files = storeRootDir.listFiles(FILTER_ON_SHARES);
+ if (files == null)
+ {
+ throw new ConfigurationFailureException(
+ "Store folder does not exist or cannot be accessed: " + storeRootDir);
+ }
Arrays.sort(files);
return files;
}
--
GitLab