jdk-sandbox: comparison src/java.base/share/classes/java/net/SocketPermission.java

equal deleted inserted replaced

-:13588c901957
+:9cf78a70fa4f
 /*
-* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2019, 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
 */
 public final class SocketPermission extends Permission
 implements java.io.Serializable
 {
+@java.io.Serial
 private static final long serialVersionUID = -7204263841984476862L;
 /**
 * Connect to host:port
 */
 * </pre>
 *
 * @param host the hostname or IP address of the computer, optionally
 * including a colon followed by a port or port range.
 * @param action the action string.
+*
+* @throws NullPointerException if any parameters are null
+* @throws IllegalArgumentException if the format of {@code host} is
+*         invalid, or if the {@code action} string is empty, malformed, or
+*         contains an action other than the specified possible actions
 */
 public SocketPermission(String host, String action) {
 super(getHost(host));
 // name initialized to getHost(host); NPE detected in getHost()
 init(getName(), getMask(action));
 // make sure we didn't just match the tail of a word
 // like "ackbarfaccept".  Also, skip to the comma.
 boolean seencomma = false;
 while (i >= matchlen && !seencomma) {
-switch(a[i-matchlen]) {
+switch (c = a[i-matchlen]) {
-case ',':
-seencomma = true;
-break;
 case ' ': case '\r': case '\n':
 case '\f': case '\t':
 break;
 default:
+if (c == ',' && i > matchlen) {
+seencomma = true;
+break;
+}
 throw new IllegalArgumentException(
 "invalid permission: " + action);
 }
 i--;
 }
 /**
 * WriteObject is called to save the state of the SocketPermission
 * to a stream. The actions are serialized, and the superclass
 * takes care of the name.
 */
+@java.io.Serial
 private synchronized void writeObject(java.io.ObjectOutputStream s)
 throws IOException
 {
 // Write out the actions. The superclass takes care of the name
 // call getActions to make sure actions field is initialized
 /**
 * readObject is called to restore the state of the SocketPermission from
 * a stream.
 */
+@java.io.Serial
 private synchronized void readObject(java.io.ObjectInputStream s)
 throws IOException, ClassNotFoundException
 {
 // Read in the action, then initialize the rest
 s.defaultReadObject();
 * Adds a permission to the SocketPermissions. The key for the hash is
 * the name in the case of wildcards, or all the IP addresses.
 *
 * @param permission the Permission object to add.
 *
-* @exception IllegalArgumentException - if the permission is not a
+* @throws    IllegalArgumentException   if the permission is not a
 *                                       SocketPermission
 *
-* @exception SecurityException - if this SocketPermissionCollection object
+* @throws    SecurityException   if this SocketPermissionCollection object
 *                                has been marked readonly
 */
 @Override
 public void add(Permission permission) {
 if (! (permission instanceof SocketPermission))
 if (((needed & x.getMask()) != 0) && x.impliesIgnoreMask(np)) {
 effective |=  x.getMask();
 if ((effective & desired) == desired) {
 return true;
 }
-needed = (desired ^ effective);
+needed = (desired & ~effective);
 }
 }
 return false;
 }
 @SuppressWarnings("unchecked")
 public Enumeration<Permission> elements() {
 return (Enumeration)Collections.enumeration(perms.values());
 }
+@java.io.Serial
 private static final long serialVersionUID = 2787186408602843674L;
 // Need to maintain serialization interoperability with earlier releases,
 // which had the serializable field:
 /**
 * @serialField permissions java.util.Vector
 *     A list of the SocketPermissions for this set.
 */
+@java.io.Serial
 private static final ObjectStreamField[] serialPersistentFields = {
 new ObjectStreamField("permissions", Vector.class),
 };
 /**
 */
 /*
 * Writes the contents of the perms field out as a Vector for
 * serialization compatibility with earlier releases.
 */
+@java.io.Serial
 private void writeObject(ObjectOutputStream out) throws IOException {
 // Don't call out.defaultWriteObject()
 // Write out Vector
 Vector<SocketPermission> permissions = new Vector<>(perms.values());
 }
 /*
 * Reads in a Vector of SocketPermissions and saves them in the perms field.
 */
+@java.io.Serial
 private void readObject(ObjectInputStream in)
 throws IOException, ClassNotFoundException
 {
 // Don't call in.defaultReadObject()

branch	datagramsocketimpl-branch
changeset 58678	9cf78a70fa4f
parent 53018	8bf9268df0e2
child 58679	9c3209ff7550