You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2018/08/09 12:26:04 UTC
svn commit: r1837720 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
Author: mreutegg
Date: Thu Aug 9 12:26:04 2018
New Revision: 1837720
URL: http://svn.apache.org/viewvc?rev=1837720&view=rev
Log:
OAK-7694: Oak.OakDefaultComponents.INSTANCE is mutable
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1837720&r1=1837719&r2=1837720&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java Thu Aug 9 12:26:04 2018
@@ -934,6 +934,10 @@ public class Oak {
public static class OakDefaultComponents {
+ /**
+ * @deprecated create a new instance of {@link OakDefaultComponents} instead.
+ */
+ @Deprecated
public static final OakDefaultComponents INSTANCE = new OakDefaultComponents();
private final Iterable<CommitHook> commitHooks = ImmutableList.of(new VersionHook());
@@ -954,7 +958,7 @@ public class Oak {
private final SecurityProvider securityProvider = SecurityProviderBuilder.newBuilder().build();
- private OakDefaultComponents() {
+ public OakDefaultComponents() {
}
public Iterable<CommitHook> commitHooks() {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java?rev=1837720&r1=1837719&r2=1837720&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java Thu Aug 9 12:26:04 2018
@@ -98,7 +98,7 @@ public class Jcr {
this.oak = oak;
if (initialize) {
- OakDefaultComponents defs = OakDefaultComponents.INSTANCE;
+ OakDefaultComponents defs = new OakDefaultComponents();
with(defs.securityProvider());
for (CommitHook ch : defs.commitHooks()) {
with(ch);