--- jsr166/src/test/jtreg/util/Hashtable/IllegalLoadFactor.java	2010/09/01 20:12:39	1.2
+++ jsr166/src/test/jtreg/util/Hashtable/IllegalLoadFactor.java	2017/10/22 02:59:18	1.7
@@ -1,5 +1,5 @@
 /*
- * Copyright 1997-1998 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1997, 1998, 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
@@ -16,9 +16,9 @@
  * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * 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
@@ -26,8 +26,6 @@
    @summary Test for an illegalargumentexception on loadFactor
 */
 
-
-
 import java.util.*;
 
 /**
@@ -36,101 +34,100 @@ import java.util.*;
  */
 public class IllegalLoadFactor {
 
-      public static void main(String argv[]) throws Exception {
-          boolean testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              Hashtable bad1 = new Hashtable(100, -3);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("Hashtable, negative load factor");
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              Hashtable bad1 = new Hashtable(100, Float.NaN);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("Hashtable, NaN load factor");
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              HashMap bad1 = new HashMap(100, -3);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("HashMap, negative load factor");
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              HashMap bad1 = new HashMap(100, Float.NaN);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("HashMap, NaN load factor");
-
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              HashSet bad1 = new HashSet(100, -3);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("HashSet, negative load factor");
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              HashSet bad1 = new HashSet(100, Float.NaN);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("HashSet, NaN load factor");
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              WeakHashMap bad1 = new WeakHashMap(100, -3);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("WeakHashMap, negative load factor");
-
-          testSucceeded = false;
-          try{
-              // this should generate an IllegalArgumentException
-              WeakHashMap bad1 = new WeakHashMap(100, Float.NaN);
-          }
-          catch (IllegalArgumentException e1) {
-              testSucceeded = true;
-          }
-          if (!testSucceeded)
-              throw new Exception("WeakHashMap, NaN load factor");
-
-          // Make sure that legal creates don't throw exceptions
-          Map goodMap = new Hashtable(100, .69f);
-          goodMap = new HashMap(100, .69f);
-          Set goodSet = new HashSet(100, .69f);
-          goodMap = new WeakHashMap(100, .69f);
-     }
-
+    public static void main(String[] args) throws Exception {
+        boolean testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            Hashtable bad1 = new Hashtable(100, -3);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("Hashtable, negative load factor");
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            Hashtable bad1 = new Hashtable(100, Float.NaN);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("Hashtable, NaN load factor");
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            HashMap bad1 = new HashMap(100, -3);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("HashMap, negative load factor");
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            HashMap bad1 = new HashMap(100, Float.NaN);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("HashMap, NaN load factor");
+
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            HashSet bad1 = new HashSet(100, -3);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("HashSet, negative load factor");
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            HashSet bad1 = new HashSet(100, Float.NaN);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("HashSet, NaN load factor");
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            WeakHashMap bad1 = new WeakHashMap(100, -3);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("WeakHashMap, negative load factor");
+
+        testSucceeded = false;
+        try {
+            // this should generate an IllegalArgumentException
+            WeakHashMap bad1 = new WeakHashMap(100, Float.NaN);
+        }
+        catch (IllegalArgumentException e1) {
+            testSucceeded = true;
+        }
+        if (!testSucceeded)
+            throw new Exception("WeakHashMap, NaN load factor");
+
+        // Make sure that legal creates don't throw exceptions
+        Map goodMap = new Hashtable(100, .69f);
+        goodMap = new HashMap(100, .69f);
+        Set goodSet = new HashSet(100, .69f);
+        goodMap = new WeakHashMap(100, .69f);
+    }
 }