Author: reschke
Date: Fri Sep 29 10:58:13 2017
New Revision: 1810084
URL: http://svn.apache.org/viewvc?rev=1810084&view=rev
Log:
OAK-6730: use temporary variables to avoid jdk9 compilation errors
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1810084&r1=1810083&r2=1810084&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Fri Sep 29 10:58:13 2017
@@ -196,23 +196,25 @@ 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
@@ -224,12 +226,13 @@ public abstract class CompositeConfigura
@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
