Handle extraproperties storage that can't be read or written

- Log more informative error message when the repository instantiation fails Resolves: https://www.pivotaltracker.com/story/show/73575994
fcrepo · Jul 24, 2014 · 32110c8 · 32110c8
1 parent a5a17ac
commit 32110c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/fcrepo-connector-file/src/main/java/org/fcrepo/connector/file/FedoraFileSystemConnector.java b/fcrepo-connector-file/src/main/java/org/fcrepo/connector/file/FedoraFileSystemConnector.java
@@ -89,6 +89,9 @@ public void initialize(final NamespaceRegistry registry,
             if (!propertiesDirectory.exists() || !propertiesDirectory.isDirectory()) {
                 throw new RepositoryException("Configured \"propertiesDirectory\", " + propertiesDirectoryPath
                         + ", does not exist or is not a directory.");
+            } else if ( !propertiesDirectory.canRead() || !propertiesDirectory.canWrite() ) {
+                throw new RepositoryException("Configured \"propertiesDirectory\", " + propertiesDirectoryPath
+                        + ", should be readable and writable.");
             }
             if (extraPropertiesStore() != null) {
                 LOGGER.warn("Extra properties store was specified but won't be used!");

diff --git a/...rnel-impl/src/main/java/org/fcrepo/kernel/impl/spring/ModeShapeRepositoryFactoryBean.java b/...rnel-impl/src/main/java/org/fcrepo/kernel/impl/spring/ModeShapeRepositoryFactoryBean.java
@@ -70,11 +70,14 @@ public void buildRepository() throws RepositoryException, IOException {
 
         getPropertiesLoader().loadSystemProperties();
 
-        repository =
-                (JcrRepository) jcrRepositoryFactory
-                        .getRepository(singletonMap(URL,
-                                repositoryConfiguration.getURL()));
-
+        try {
+            repository = (JcrRepository) jcrRepositoryFactory.getRepository(
+                    singletonMap(URL, repositoryConfiguration.getURL()));
+        } catch ( RepositoryException ex ) {
+            LOGGER.error("Error loading repository with configuration: {}",
+                    ((ClassPathResource) repositoryConfiguration).getPath());
+            throw ex;
+        }
     }
 
     @Override