From 46cb7c49ab125f0bfffadce0e0a80da4889dae07 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 28 Jan 2010 20:49:00 +0300 Subject: [PATCH] 6412286: DOC: LTP: Unspecified NPE in java.beans.DefaultPersistenceDelegate.instantiate method Reviewed-by: peterz --- .../classes/java/beans/DefaultPersistenceDelegate.java | 6 +++++- jdk/src/share/classes/java/beans/PersistenceDelegate.java | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java index 5339aba83e4..9152909816e 100644 --- a/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java +++ b/jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2000-2010 Sun Microsystems, Inc. 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 @@ -146,6 +146,8 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { * @param out The code output stream. * @return An expression whose value is oldInstance. * + * @throws NullPointerException if {@code out} is {@code null} + * * @see #DefaultPersistenceDelegate(String[]) */ protected Expression instantiate(Object oldInstance, Encoder out) { @@ -367,6 +369,8 @@ public class DefaultPersistenceDelegate extends PersistenceDelegate { * @param newInstance The instance that is to be modified. * @param out The stream to which any initialization statements should be written. * + * @throws NullPointerException if {@code out} is {@code null} + * * @see java.beans.Introspector#getBeanInfo * @see java.beans.PropertyDescriptor */ diff --git a/jdk/src/share/classes/java/beans/PersistenceDelegate.java b/jdk/src/share/classes/java/beans/PersistenceDelegate.java index ca837941039..fd9b31a490f 100644 --- a/jdk/src/share/classes/java/beans/PersistenceDelegate.java +++ b/jdk/src/share/classes/java/beans/PersistenceDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright 2000-2010 Sun Microsystems, Inc. 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 @@ -105,6 +105,8 @@ public abstract class PersistenceDelegate { * * @param oldInstance The instance that will be created by this expression. * @param out The stream to which this expression will be written. + * + * @throws NullPointerException if {@code out} is {@code null} */ public void writeObject(Object oldInstance, Encoder out) { Object newInstance = out.get(oldInstance); @@ -158,6 +160,8 @@ public abstract class PersistenceDelegate { * @param oldInstance The instance that will be created by this expression. * @param out The stream to which this expression will be written. * @return An expression whose value is oldInstance. + * + * @throws NullPointerException if {@code out} is {@code null} */ protected abstract Expression instantiate(Object oldInstance, Encoder out); @@ -196,6 +200,8 @@ public abstract class PersistenceDelegate { * @param oldInstance The instance to be copied. * @param newInstance The instance that is to be modified. * @param out The stream to which any initialization statements should be written. + * + * @throws NullPointerException if {@code out} is {@code null} */ protected void initialize(Class type, Object oldInstance, Object newInstance,