From 26be638d678e0681b8c6d6e67a7a52ab0c3c4e29 Mon Sep 17 00:00:00 2001 From: Andrew Haley Date: Thu, 5 Aug 2004 17:51:11 +0000 Subject: [PATCH] BasicPermission.java: Don't check wildcards. 2004-08-04 Andrew Haley * java/security/BasicPermission.java: Don't check wildcards. From-SVN: r85608 --- libjava/ChangeLog | 4 ++++ libjava/java/security/BasicPermission.java | 16 +++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1c250b5a7a4..575c59188e9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-08-04 Andrew Haley + + * java/security/BasicPermission.java: Don't check wildcards. + 2004-08-04 Thomas Fitzsimmons Michael Koch diff --git a/libjava/java/security/BasicPermission.java b/libjava/java/security/BasicPermission.java index 0945f2d7faf..7b98563518e 100644 --- a/libjava/java/security/BasicPermission.java +++ b/libjava/java/security/BasicPermission.java @@ -80,9 +80,8 @@ public abstract class BasicPermission extends Permission private static final long serialVersionUID = 6279438298436773498L; /** - * Create a new instance with the specified permission name. If the name - * is empty, or contains an illegal wildcard character, an exception is - * thrown. + * Create a new instance with the specified permission name. If the + * name is empty an exception is thrown. * * @param name the name of this permission * @throws NullPointerException if name is null @@ -91,12 +90,11 @@ public abstract class BasicPermission extends Permission public BasicPermission(String name) { super(name); - if (name.indexOf("*") != -1) - { - if ((! name.endsWith(".*") && ! name.equals("*")) - || name.indexOf("*") != name.lastIndexOf("*")) - throw new IllegalArgumentException("Bad wildcard: " + name); - } + + // This routine used to check for illegal wildcards, but no such + // requirement exists in the specification and Sun's runtime + // doesn't appear to do it. + if ("".equals(name)) throw new IllegalArgumentException("Empty name"); } -- 2.30.2