From a7e60f4913a41f21d43e13cd0301994cb9f9c935 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <malenkov@openjdk.org>
Date: Fri, 23 Aug 2013 19:29:39 +0400
Subject: [PATCH] 7080613:
 java.beans.DefaultPersistenceDelegate.instantiate(..) doesn't throw NPE

Reviewed-by: alexsch
---
 jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java | 1 +
 jdk/src/share/classes/java/beans/PersistenceDelegate.java        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
index de6a1b75178..0d056c2e8e5 100644
--- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -149,6 +149,7 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate {
      * @return An expression whose value is <code>oldInstance</code>.
      *
      * @throws NullPointerException if {@code out} is {@code null}
+     *                              and this value is used in the method
      *
      * @see #DefaultPersistenceDelegate(String[])
      */
diff --git a/jdk/src/share/classes/java/beans/PersistenceDelegate.java b/jdk/src/share/classes/java/beans/PersistenceDelegate.java
index bbdcdbf060c..4124d2ff935 100644
--- a/jdk/src/share/classes/java/beans/PersistenceDelegate.java
+++ b/jdk/src/share/classes/java/beans/PersistenceDelegate.java
@@ -162,6 +162,7 @@ public abstract class PersistenceDelegate {
      * @return An expression whose value is <code>oldInstance</code>.
      *
      * @throws NullPointerException if {@code out} is {@code null}
+     *                              and this value is used in the method
      */
     protected abstract Expression instantiate(Object oldInstance, Encoder out);