jdk-sandbox: comparison jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos/DelegationPermission.java

equal deleted inserted replaced

-:a6b5f444cb68
+:00a25f4c4d44
 /*
-* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2000, 2015, 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.  Oracle designates this
 * questions.
 */
 package javax.security.auth.kerberos;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
+import java.security.BasicPermission;
+import java.security.Permission;
+import java.security.PermissionCollection;
 import java.util.*;
-import java.security.Permission;
+import java.util.concurrent.ConcurrentHashMap;
-import java.security.BasicPermission;
-import java.security.PermissionCollection;
-import java.io.ObjectStreamField;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.IOException;
 /**
 * This class is used to restrict the usage of the Kerberos
 * delegation model, ie: forwardable and proxiable tickets.
 * <p>
 * @param p the permission to check against.
 *
 * @return true if the specified permission is implied by this object,
 * false if not.
 */
+@Override
 public boolean implies(Permission p) {
 if (!(p instanceof DelegationPermission))
 return false;
 DelegationPermission that = (DelegationPermission) p;
 *
 * @return true if {@code obj} is a DelegationPermission, and
 *  has the same subordinate and service principal as this.
 *  DelegationPermission object.
 */
+@Override
 public boolean equals(Object obj) {
 if (obj == this)
 return true;
 if (! (obj instanceof DelegationPermission))
 /**
 * Returns the hash code value for this object.
 *
 * @return a hash code value for this object.
 */
+@Override
 public int hashCode() {
 return getName().hashCode();
 }
 /**
 * Returns a PermissionCollection object for storing
 * DelegationPermission objects.
 * <br>
 * be implemented in an efficient (and consistent) manner.
 *
 * @return a new PermissionCollection object suitable for storing
 * DelegationPermissions.
 */
+@Override
 public PermissionCollection newPermissionCollection() {
 return new KrbDelegationPermissionCollection();
 }
 /**
 final class KrbDelegationPermissionCollection extends PermissionCollection
 implements java.io.Serializable {
 // Not serialized; see serialization section at end of class.
-private transient List<Permission> perms;
+private transient ConcurrentHashMap<Permission, Boolean> perms;
 public KrbDelegationPermissionCollection() {
-perms = new ArrayList<Permission>();
+perms = new ConcurrentHashMap<>();
 }
 /**
 * Check and see if this collection of permissions implies the permissions
 * expressed in "permission".
 *
 * @param permission the Permission object to compare
 *
 * @return true if "permission" is a proper subset of a permission in
 * the collection, false if not.
 */
+@Override
 public boolean implies(Permission permission) {
 if (! (permission instanceof DelegationPermission))
 return false;
-synchronized (this) {
+// if map contains key, then it automatically implies it
-for (Permission x : perms) {
+return perms.containsKey(permission);
-if (x.implies(permission))
-return true;
-}
-}
-return false;
 }
 /**
 * Adds a permission to the DelegationPermissions. The key for
 * the hash is the name.
 *                                       DelegationPermission
 *
 * @exception SecurityException - if this PermissionCollection object
 *                                has been marked readonly
 */
+@Override
 public void add(Permission permission) {
 if (! (permission instanceof DelegationPermission))
 throw new IllegalArgumentException("invalid permission: "+
 permission);
 if (isReadOnly())
 throw new SecurityException("attempt to add a Permission to a readonly PermissionCollection");
-synchronized (this) {
+perms.put(permission, Boolean.TRUE);
-perms.add(0, permission);
-}
 }
 /**
 * Returns an enumeration of all the DelegationPermission objects
 * in the container.
 *
 * @return an enumeration of all the DelegationPermission objects.
 */
+@Override
 public Enumeration<Permission> elements() {
-// Convert Iterator into Enumeration
+return perms.keys();
-synchronized (this) {
-return Collections.enumeration(perms);
-}
 }
 private static final long serialVersionUID = -3383936936589966948L;
 // Need to maintain serialization interoperability with earlier releases,
 */
 private void writeObject(ObjectOutputStream out) throws IOException {
 // Don't call out.defaultWriteObject()
 // Write out Vector
-Vector<Permission> permissions = new Vector<>(perms.size());
+Vector<Permission> permissions = new Vector<>(perms.keySet());
-synchronized (this) {
-permissions.addAll(perms);
-}
 ObjectOutputStream.PutField pfields = out.putFields();
 pfields.put("permissions", permissions);
 out.writeFields();
 }
 // Read in serialized fields
 ObjectInputStream.GetField gfields = in.readFields();
 // Get the one we want
 Vector<Permission> permissions =
 (Vector<Permission>)gfields.get("permissions", null);
-perms = new ArrayList<Permission>(permissions.size());
+perms = new ConcurrentHashMap<>(permissions.size());
-perms.addAll(permissions);
+for (Permission perm : permissions) {
+perms.put(perm, Boolean.TRUE);
+}
 }
 }

changeset 31080	00a25f4c4d44
parent 29492	a4bf9a570035
child 31265	2eabccc392ed