diff options
author | 2016-10-26 10:17:40 +0000 | |
---|---|---|
committer | 2016-10-26 11:11:18 +0000 | |
commit | b25a03452fa414660ea2f326e3d2b2c06c1ca548 (patch) | |
tree | ad27c62e341b26efcf455941848884666875f8ce /src | |
parent | 3be9fd32eddba25bae819b05109dc5871642fb9d (diff) |
Fix uses of LocalRepositoryLookupFunction to work with JDK7.
--
MOS_MIGRATED_REVID=137257525
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java | 2 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java index 4c97875c11..cafcfbfebf 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/LocalRepositoryLookupFunction.java @@ -135,7 +135,7 @@ public class LocalRepositoryLookupFunction implements SkyFunction { * if Skyframe needs to re-run, {@link Optional#of(LocalRepositoryLookupValue)} otherwise. */ private Optional<LocalRepositoryLookupValue> maybeCheckWorkspaceForRepository( - Environment env, RootedPath directory) + Environment env, final RootedPath directory) throws InterruptedException, LocalRepositoryLookupFunctionException { // Look up the main WORKSPACE file by the external package, to find all repositories. PackageLookupValue externalPackageLookupValue; diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java index a8ead28268..48dd471132 100644 --- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java +++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java @@ -124,7 +124,8 @@ public abstract class PackageLookupFunctionTest extends FoundationTestCase { SkyFunctions.FILE_SYMLINK_CYCLE_UNIQUENESS, new FileSymlinkCycleUniquenessFunction()); ImmutableMap<String, RepositoryFunction> repositoryHandlers = - ImmutableMap.of(LocalRepositoryRule.NAME, new LocalRepositoryFunction()); + ImmutableMap.of( + LocalRepositoryRule.NAME, (RepositoryFunction) new LocalRepositoryFunction()); skyFunctions.put( SkyFunctions.REPOSITORY_DIRECTORY, new RepositoryDelegatorFunction(repositoryHandlers, null, new AtomicBoolean(true))); |