Re: [9] RFR of 8075362: j.u.Properties.load() methods have misaligned @throws clauses

[Roger Riggs]

Hi Brian,

Looks fine.

Roger


On 3/17/2015 3:15 PM, Brian Burkhalter wrote:

Follow-on to correct some insufficiencies pointed out in

http://mail.openjdk.java.net/pipermail/core-libs-dev/2015-March/032289.html

Please review at your convenience.

Issue:  https://bugs.openjdk.java.net/browse/JDK-8075362
Diff:           See below (Properties.java change did not show up in webrev).

Thanks,

Brian

diff --git a/src/java.base/share/classes/java/util/Properties.java 
b/src/java.base/share/classes/java/util/Properties.java
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -309,7 +309,7 @@
       *          input stream.
       * @throws  IllegalArgumentException if a malformed Unicode escape
       *          appears in the input.
-     * @throws NullPointerException if {@code reader} is null.
+     * @throws  NullPointerException if {@code reader} is null.
       * @since   1.6
       */
      public synchronized void load(Reader reader) throws IOException {
@@ -335,7 +335,7 @@
       *             input stream.
       * @throws     IllegalArgumentException if the input stream contains a
       *             malformed Unicode escape sequence.
-     * @throws NullPointerException if {@code inStream} is null.
+     * @throws     NullPointerException if {@code inStream} is null.
       * @since 1.2
       */
      public synchronized void load(InputStream inStream) throws IOException {

diff --git a/test/java/util/Properties/Basic.java 
b/test/java/util/Properties/LoadAndStoreNPE.java
rename from test/java/util/Properties/Basic.java
rename to test/java/util/Properties/LoadAndStoreNPE.java

--- a/test/java/util/Properties/Basic.java
+++ b/test/java/util/Properties/LoadAndStoreNPE.java
@@ -28,10 +28,10 @@

/*

   * @test
- * @bug 8073214
- * @summary Basic tests of Properties methods.
+ * @bug 8073214 8075362
+ * @summary Tests to verify that load() and store() throw NPEs as advertised.
   */
-public class Basic
+public class LoadAndStoreNPE
  {
      public static void main(String[] args) throws Exception
      {
@@ -68,7 +68,7 @@
          }

if (failures != 0) {

-            throw new RuntimeException("Basic failed with "
+            throw new RuntimeException("LoadAndStoreNPE failed with "
                  + failures + " errors!");
          }
      }