diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f3bfc41d217ae3070fa84ea1d95ce113bdd9802..c7d7ef1e91b5e54b893b4c1cfb1e74338c40b104 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ Toutes les modifications apportées au projet seront documentées dans ce fichie Le format est basé sur le modèle [Keep a Changelog](http://keepachangelog.com/) et adhère aux principes du [Semantic Versioning](http://semver.org/). +## [4.7.20] - 24-08-19 + +### Corrections + +- Une vérification au niveau des dossiers déclenchait des erreurs non attendues + ## [4.7.19] - 24-08-06 ### Corrections diff --git a/iparapheur-amp/pom.xml b/iparapheur-amp/pom.xml index 209a898bbbda7ffd3fe3e0a8c402c6b395981c21..45ab6b2fb9d96ab44fceab215ab5a83d1373b580 100644 --- a/iparapheur-amp/pom.xml +++ b/iparapheur-amp/pom.xml @@ -6,13 +6,13 @@ <parent> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> </parent> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur-amp</artifactId> <description>Parapheur electronique</description> <packaging>war</packaging> - <version>4.7.19-for-Alf3.4.c</version> + <version>4.7.20-for-Alf3.4.c</version> <name>i-Parapheur AMP packaging</name> <url>http://maven.apache.org</url> <properties> @@ -65,13 +65,13 @@ <dependency> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur-core</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> </dependency> <dependency> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur-mobile-webscripts</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> </dependency> <dependency> diff --git a/iparapheur-core/pom.xml b/iparapheur-core/pom.xml index a87ed9cda824a59fa07f0e36e32316086c8b2f3f..514f7a256cbc1f9f821b091a93260d590afbfa11 100644 --- a/iparapheur-core/pom.xml +++ b/iparapheur-core/pom.xml @@ -5,14 +5,14 @@ <parent> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur-core</artifactId> <packaging>jar</packaging> <name>iparapheur core module</name> - <version>4.7.19</version> + <version>4.7.20</version> <description>Parapheur electronique</description> <!-- General Info --> <url>https://adullact.net/projects/paraphelec/</url> @@ -294,7 +294,7 @@ <dependency> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur-rules</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> <!-- exclusions> <exclusion> <artifactId>asm</artifactId> diff --git a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java index 8b5b3bcaacc3333e580c26ebdbc777eeb2d7c859..2e81719a74b66298d3cff9e0fe67a2f9624fad20 100755 --- a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java +++ b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java @@ -7162,8 +7162,11 @@ public final class ParapheurServiceImpl implements ParapheurService, Initializin private boolean isOfType(NodeRef nodeRef, QName type) { Assert.notNull(nodeRef, "Node Ref is mandatory"); Assert.notNull(this.nodeService, "NodeService is mandatory"); - Assert.isTrue(this.nodeService.exists(nodeRef), "Node Ref must exist in the repository"); Assert.notNull(type, "Type is mandatory"); + if(!this.nodeService.exists(nodeRef)) { + logger.warn("Node Ref does not exists - " + nodeRef.getId()); + return false; + } // find it's type so we can see if it's a node we are interested in QName type2 = this.nodeService.getType(nodeRef); diff --git a/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties b/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties index b07c1a6f1b43aa542962cedbc7c1e1b8726e8b2c..a8626d3034d34f3675b9bc755396ed7360a390be 100755 --- a/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties +++ b/iparapheur-core/src/main/resources/alfresco/module/parapheur/core/parapheur-version.properties @@ -1,2 +1,2 @@ -ph_version=4.7.19 +ph_version=4.7.20 ph_build=20240611 diff --git a/iparapheur-mobile-webscripts/pom.xml b/iparapheur-mobile-webscripts/pom.xml index 13c3de9a42b194150e13d2dcbbc7b7a06f0d03e2..e43b1d76256093da58199182c8a49db1c8ec91b1 100644 --- a/iparapheur-mobile-webscripts/pom.xml +++ b/iparapheur-mobile-webscripts/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>iparapheur</artifactId> <groupId>org.adullact.iparapheur</groupId> - <version>4.7.19</version> + <version>4.7.20</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -94,7 +94,7 @@ <dependency> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur-core</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> <scope>provided</scope> </dependency> diff --git a/iparapheur-rules/pom.xml b/iparapheur-rules/pom.xml index a4a4bcd69e42395e7491851843ccf4c0bb80e180..6285398b35a7267e600f7043fa383fec8d2c2dd3 100644 --- a/iparapheur-rules/pom.xml +++ b/iparapheur-rules/pom.xml @@ -5,10 +5,10 @@ <parent> <groupId>org.adullact.iparapheur</groupId> <artifactId>iparapheur</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> </parent> <artifactId>iparapheur-rules</artifactId> - <version>4.7.19</version> + <version>4.7.20</version> <name>iparapheur-rules</name> <url>http://maven.apache.org</url> <properties> diff --git a/pom.xml b/pom.xml index b2d0061b4922c7a7ddca9b121225e146e9611491..15863ffb0e46bc312d71c3025d88ee34d16dd1ae 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <artifactId>iparapheur</artifactId> <packaging>pom</packaging> <name>iparapheur</name> - <version>4.7.19</version> + <version>4.7.20</version> <description>Parapheur electronique</description> <url>https://adullact.net/projects/paraphelec/</url>