You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2019/01/11 14:50:50 UTC
svn commit: r1851057 - in /jackrabbit/branches/2.8: ./
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
Author: reschke
Date: Fri Jan 11 14:50:50 2019
New Revision: 1851057
URL: http://svn.apache.org/viewvc?rev=1851057&view=rev
Log:
JCR-4253: RepositoryConfig: add some handling for mkdir failure (ported to 2.8)
(patch by diego.schivo - thanks)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 11 14:50:50 2019
@@ -2,4 +2,4 @@
/jackrabbit/branches/2.14:1813154
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1720093,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1776384-1776385,1776407,1776413,1779166,1779460,1780208,1780335-1780336,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1720093,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1776384-1776385,1776407,1776413,1779166,1779460,1780208,1780335-1780336,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1817201,1818586,1819269,1820133,1821597,1822863,1822947,1822950,1826230,1826647,1826940,1826964,1833374
Modified: jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java?rev=1851057&r1=1851056&r2=1851057&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/RepositoryConfig.java Fri Jan 11 14:50:50 2019
@@ -192,10 +192,13 @@ public class RepositoryConfig
private static void installRepositorySkeleton(
File dir, File xml, URL resource)
- throws IOException {
+ throws IOException, ConfigurationException {
if (!dir.exists()) {
log.info("Creating repository directory {}", dir);
- dir.mkdirs();
+ boolean dirCreated = dir.mkdirs();
+ if (!dirCreated) {
+ throw new ConfigurationException("Cannot create repository directory " + dir);
+ }
}
if (!xml.exists()) {
@@ -541,7 +544,10 @@ public class RepositoryConfig
// Get the physical workspace root directory (create it if not found)
File directory = new File(workspaceDirectory);
if (!directory.exists()) {
- directory.mkdirs();
+ boolean directoryCreated = directory.mkdirs();
+ if (!directoryCreated) {
+ throw new ConfigurationException("Cannot create workspace root directory " + directory);
+ }
}
// Get all workspace subdirectories