--- old/src/share/classes/java/net/SocketPermission.java Mon Oct 1 10:50:45 2012 +++ new/src/share/classes/java/net/SocketPermission.java Mon Oct 1 10:50:44 2012 @@ -138,7 +138,7 @@ */ public final class SocketPermission extends Permission -implements java.io.Serializable + implements java.io.Serializable { private static final long serialVersionUID = -7204263841984476862L; @@ -232,8 +232,7 @@ trustNameService = tmp.booleanValue(); } - private static synchronized Debug getDebug() - { + private static synchronized Debug getDebug() { if (!debugInit) { debug = Debug.getInstance("access"); debugInit = true; @@ -288,8 +287,7 @@ defaultDeny = true; } - private static String getHost(String host) - { + private static String getHost(String host) { if (host.equals("")) { return "localhost"; } else { @@ -679,8 +677,8 @@ } private boolean authorizedIPv4(String cname, byte[] addr) { - String authHost = ""; - InetAddress auth; + String authHost = ""; + InetAddress auth; try { authHost = "auth." + @@ -708,8 +706,8 @@ } private boolean authorizedIPv6(String cname, byte[] addr) { - String authHost = ""; - InetAddress auth; + String authHost = ""; + InetAddress auth; try { StringBuffer sb = new StringBuffer(39); @@ -810,7 +808,6 @@ * @return true if the specified permission is implied by this object, * false if not. */ - public boolean implies(Permission p) { int i,j; @@ -844,12 +841,11 @@ * to find a match based on the IP addresses in both objects. *
  • Attempt to match on the canonical hostnames of both objects. * - * @param p the incoming permission request + * @param that the incoming permission request * * @return true if "permission" is a proper subset of the current object, * false if not. */ - boolean impliesIgnoreMask(SocketPermission that) { int i,j; @@ -1229,7 +1225,7 @@ */ final class SocketPermissionCollection extends PermissionCollection -implements Serializable + implements Serializable { // Not serialized; see serialization section at end of class private transient List perms; @@ -1255,9 +1251,7 @@ * @exception SecurityException - if this SocketPermissionCollection object * has been marked readonly */ - - public void add(Permission permission) - { + public void add(Permission permission) { if (! (permission instanceof SocketPermission)) throw new IllegalArgumentException("invalid permission: "+ permission); @@ -1276,7 +1270,7 @@ * Check and see if this collection of permissions implies the permissions * expressed in "permission". * - * @param p the Permission object to compare + * @param permission the Permission object to compare * * @return true if "permission" is a proper subset of a permission in * the collection, false if not. @@ -1369,8 +1363,9 @@ /* * Reads in a Vector of SocketPermissions and saves them in the perms field. */ - private void readObject(ObjectInputStream in) throws IOException, - ClassNotFoundException { + private void readObject(ObjectInputStream in) + throws IOException, ClassNotFoundException + { // Don't call in.defaultReadObject() // Read in serialized fields