You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/09/22 14:56:13 UTC
[sling-org-apache-sling-jcr-base] annotated tag
org.apache.sling.jcr.base-3.1.6 created (now e7b4daf)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.jcr.base-3.1.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git.
at e7b4daf (tag)
tagging 4877092f558e17eee7051e77e20e160a3722875d (commit)
replaces org.apache.sling.jcr.base-3.1.4
by Robert Munteanu
on Tue Sep 22 16:56:07 2020 +0200
- Log -----------------------------------------------------------------
[maven-release-plugin] copy for tag org.apache.sling.jcr.base-3.1.6
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 26eaf8e SLING-9722 - AbstractSlingRepositoryManager.stop throws NullPointerExceptions if invoked multiple times
new 7e484c6 Remove outdated comment - can't override final methods.
new 4877092 [maven-release-plugin] prepare release org.apache.sling.jcr.base-3.1.6
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-jcr-base] 03/03: [maven-release-plugin]
prepare release org.apache.sling.jcr.base-3.1.6
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.base-3.1.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git
commit 4877092f558e17eee7051e77e20e160a3722875d
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 22 16:55:58 2020 +0200
[maven-release-plugin] prepare release org.apache.sling.jcr.base-3.1.6
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0e93fcf..660dbe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.jcr.base</artifactId>
- <version>3.1.5-SNAPSHOT</version>
+ <version>3.1.6</version>
<name>Apache Sling JCR Base</name>
<description>
@@ -39,7 +39,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jcr-base.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.jcr.base-3.1.6</tag>
</scm>
<build>
[sling-org-apache-sling-jcr-base] 02/03: Remove outdated comment -
can't override final methods.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.base-3.1.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git
commit 7e484c67fb68e2798d04cec5e2f1b0b42e11f684
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 22 16:26:19 2020 +0200
Remove outdated comment - can't override final methods.
---
.../java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
index f5d22b8..4cb629f 100644
--- a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
+++ b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
@@ -611,9 +611,6 @@ public abstract class AbstractSlingRepositoryManager {
}
}
- /**
- * This method must be called if overwritten by implementations !!
- */
protected final void stop() {
log.info("Stop requested");
if ( startupThread != null && startupThread != Thread.currentThread() ) {
[sling-org-apache-sling-jcr-base] 01/03: SLING-9722 -
AbstractSlingRepositoryManager.stop throws NullPointerExceptions if invoked
multiple times
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.base-3.1.6
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git
commit 26eaf8e9d1a37e050479d3f2256dd85dfe644ba1
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Tue Sep 22 16:25:42 2020 +0200
SLING-9722 - AbstractSlingRepositoryManager.stop throws NullPointerExceptions if invoked multiple times
Add null check. There may still be a check-then-act condition here. However, the waitForStartupThreadToComplete method is probably heavyweight enough to ensure that we don't see the race condition fulfilled.
---
.../java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
index 65ab01b..f5d22b8 100644
--- a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
+++ b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java
@@ -616,7 +616,7 @@ public abstract class AbstractSlingRepositoryManager {
*/
protected final void stop() {
log.info("Stop requested");
- if ( startupThread != Thread.currentThread() ) {
+ if ( startupThread != null && startupThread != Thread.currentThread() ) {
waitForStartupThreadToComplete();
startupThread = null;
}