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 re...@apache.org on 2019/10/27 12:02:15 UTC
svn commit: r1869035 - in /jackrabbit/oak/branches/1.4: ./ oak-core/
oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Author: reschke
Date: Sun Oct 27 12:02:15 2019
New Revision: 1869035
URL: http://svn.apache.org/viewvc?rev=1869035&view=rev
Log:
OAK-6730: use temporary variables to avoid jdk9 compilation errors (merged r1810084 into 1.4)
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1810084
Propchange: jackrabbit/oak/branches/1.4/oak-core/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk/oak-core:r1810084
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1869035&r1=1869034&r2=1869035&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java Sun Oct 27 12:02:15 2019
@@ -187,34 +187,37 @@ public abstract class CompositeConfigura
@Nonnull
@Override
public List<? extends CommitHook> getCommitHooks(@Nonnull final String workspaceName) {
- return ImmutableList.copyOf(Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<? extends CommitHook>>() {
+ Iterable<CommitHook> t = Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<? extends CommitHook>>() {
@Override
public List<? extends CommitHook> apply(T securityConfiguration) {
return securityConfiguration.getCommitHooks(workspaceName);
}
- })));
+ }));
+ return ImmutableList.copyOf(t);
}
@Nonnull
@Override
public List<? extends ValidatorProvider> getValidators(@Nonnull final String workspaceName, @Nonnull final Set<Principal> principals, @Nonnull final MoveTracker moveTracker) {
- return ImmutableList.copyOf(Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<? extends ValidatorProvider>>() {
+ Iterable<ValidatorProvider> t = Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<? extends ValidatorProvider>>() {
@Override
public List<? extends ValidatorProvider> apply(T securityConfiguration) {
return securityConfiguration.getValidators(workspaceName, principals, moveTracker);
}
- })));
+ }));
+ return ImmutableList.copyOf(t);
}
@Nonnull
@Override
public List<ProtectedItemImporter> getProtectedItemImporters() {
- return ImmutableList.copyOf(Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<? extends ProtectedItemImporter>>() {
+ Iterable<ProtectedItemImporter> t = Iterables.concat(Lists.transform(getConfigurations(), new Function<T, List<? extends ProtectedItemImporter>>() {
@Override
public List<? extends ProtectedItemImporter> apply(T securityConfiguration) {
return securityConfiguration.getProtectedItemImporters();
}
- })));
+ }));
+ return ImmutableList.copyOf(t);
}
@Nonnull