Skip to content

Commit c082976

Browse files
authored
Merge pull request #128 from evolvedbinary/7.x.x/hotfix/auto-deployment-dir-missing
[7.x.x] Ignore the 'autodeploy' folder if it does not exist
2 parents bc1c015 + 612552f commit c082976

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

exist-core/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,7 @@
945945
<include>src/main/java/org/exist/numbering/NodeIdFactory.java</include>
946946
<include>src/main/java/org/exist/protocolhandler/xmldb/XmldbURL.java</include>
947947
<include>src/main/java/org/exist/protocolhandler/xmlrpc/XmlrpcUpload.java</include>
948+
<include>src/main/java/org/exist/repo/AutoDeploymentTrigger.java</include>
948949
<include>src/main/java/org/exist/repo/ClasspathHelper.java</include>
949950
<include>src/main/java/org/exist/repo/Deployment.java</include>
950951
<include>src/main/java/org/exist/repo/ExistRepository.java</include>
@@ -1546,6 +1547,7 @@
15461547
<exclude>src/main/java/org/exist/numbering/NodeIdFactory.java</exclude>
15471548
<exclude>src/main/java/org/exist/protocolhandler/xmldb/XmldbURL.java</exclude>
15481549
<exclude>src/main/java/org/exist/protocolhandler/xmlrpc/XmlrpcUpload.java</exclude>
1550+
<exclude>src/main/java/org/exist/repo/AutoDeploymentTrigger.java</exclude>
15491551
<exclude>src/main/java/org/exist/repo/ClasspathHelper.java</exclude>
15501552
<exclude>src/main/java/org/exist/repo/Deployment.java</exclude>
15511553
<exclude>src/main/java/org/exist/repo/ExistRepository.java</exclude>

exist-core/src/main/java/org/exist/repo/AutoDeploymentTrigger.java

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,28 @@
11
/*
2+
* Elemental
3+
* Copyright (C) 2024, Evolved Binary Ltd
4+
*
5+
6+
* https://www.evolvedbinary.com | https://www.elemental.xyz
7+
*
8+
* This library is free software; you can redistribute it and/or
9+
* modify it under the terms of the GNU Lesser General Public
10+
* License as published by the Free Software Foundation; version 2.1.
11+
*
12+
* This library is distributed in the hope that it will be useful,
13+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15+
* Lesser General Public License for more details.
16+
*
17+
* You should have received a copy of the GNU Lesser General Public
18+
* License along with this library; if not, write to the Free Software
19+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20+
*
21+
* NOTE: Parts of this file contain code from 'The eXist-db Authors'.
22+
* The original license header is included below.
23+
*
24+
* =====================================================================
25+
*
226
* eXist-db Open Source Native XML Database
327
* Copyright (C) 2001 The eXist-db Authors
428
*
@@ -81,7 +105,7 @@ public void execute(final DBBroker sysBroker, final Txn transaction, final Map<S
81105
}
82106
}
83107

84-
if (!Files.isReadable(autodeployDir) && Files.isDirectory(autodeployDir)) {
108+
if (!(Files.isReadable(autodeployDir) && Files.isDirectory(autodeployDir))) {
85109
LOG.warn("Unable to read autodeploy directory: {}", autodeployDir);
86110
return;
87111
}

0 commit comments

Comments
 (0)