1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

7076310: (file) AclEntry.Builder setFlags throws IllegalArgumentException if set argument is empty

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Stephen Flores 2011-12-22 10:52:17 +00:00 committed by Alan Bateman
parent 440adedd51
commit a046e398d5
2 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jdk/src/share/classes/java/nio/file/attribute/AclEntry.java
View File

@ -175,9 +175,15 @@ public final class AclEntry {
* AclEntryPermission} * AclEntryPermission}
*/ */
public Builder setPermissions(Set<AclEntryPermission> perms) { public Builder setPermissions(Set<AclEntryPermission> perms) {
// copy and check for erroneous elements if (perms.isEmpty()) {
perms = EnumSet.copyOf(perms); // EnumSet.copyOf does not allow empty set
checkSet(perms, AclEntryPermission.class); perms = Collections.emptySet();
} else {
// copy and check for erroneous elements
perms = EnumSet.copyOf(perms);
checkSet(perms, AclEntryPermission.class);
}
this.perms = perms; this.perms = perms;
return this; return this;
} }
@ -212,9 +218,15 @@ public final class AclEntry {
* AclEntryFlag} * AclEntryFlag}
*/ */
public Builder setFlags(Set<AclEntryFlag> flags) { public Builder setFlags(Set<AclEntryFlag> flags) {
// copy and check for erroneous elements if (flags.isEmpty()) {
flags = EnumSet.copyOf(flags); // EnumSet.copyOf does not allow empty set
checkSet(flags, AclEntryFlag.class); flags = Collections.emptySet();
} else {
// copy and check for erroneous elements
flags = EnumSet.copyOf(flags);
checkSet(flags, AclEntryFlag.class);
}
this.flags = flags; this.flags = flags;
return this; return this;
} }

47
jdk/test/java/nio/file/attribute/AclEntry/EmptySet.java Normal file
View File

@ -0,0 +1,47 @@
/*
* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
* @bug 7076310
* @summary Test AclEntry.Builder setFlags and setPermissions with empty sets
*/
import java.nio.file.attribute.*;
import java.util.*;
/*
* Test for bug 7076310 "(file) AclEntry.Builder setFlags throws
* IllegalArgumentException if set argument is empty"
* The bug is only applies when the given Set is NOT an instance of EnumSet.
*
* The setPermissions method also has the same problem.
*/
public class EmptySet {
public static void main(String[] args) {
Set<AclEntryFlag> flags = new HashSet<>();
AclEntry.newBuilder().setFlags(flags);
Set<AclEntryPermission> perms = new HashSet<>();
AclEntry.newBuilder().setPermissions(perms);
}
}