# HG changeset patch # User redestad # Date 1480605609 -3600 # Thu Dec 01 16:20:09 2016 +0100 # Node ID fea7ab5b2c072608d62459308fe7e5d8292ce1b6 # Parent 90b5b235e6b030d0742af2ee5b8ec701ff0465f9 8170602: Startup regression due to introduction of lambda in java.io.FilePermissionCollection Reviewed-by: TBD diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java --- a/src/java.base/share/classes/java/io/FilePermission.java +++ b/src/java.base/share/classes/java/io/FilePermission.java @@ -1077,7 +1077,10 @@ // Add permission to map if it is absent, or replace with new // permission if applicable. perms.merge(fp.getName(), fp, - (existingVal, newVal) -> { + new java.util.function.BiFunction<>() { + @Override + public Permission apply(Permission existingVal, + Permission newVal) { int oldMask = ((FilePermission)existingVal).getMask(); int newMask = ((FilePermission)newVal).getMask(); if (oldMask != newMask) { @@ -1092,6 +1095,7 @@ } return existingVal; } + } ); }