# HG changeset patch
# User lana
# Date 1434648297 25200
# Node ID 47e9512ea4273dca4bbb0262e6b1cf8a69e2be80
# Parent  fdd3914e481e5c0d696f4b15b516baa77208b4c0# Parent  123a0b07b6327e1abee29ed709ec96cde514c8c0
Merge

diff -r fdd3914e481e -r 47e9512ea427 corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java	Thu Jun 18 01:43:08 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynAny.java	Thu Jun 18 10:24:57 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -52,8 +52,8 @@
      *
      * @param dyn_any the <code>DynAny</code> object whose contents
      *                are assigned to this <code>DynAny</code>.
-     * @throws Invalid if the source <code>DynAny</code> is
-     *            invalid
+     * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
+     * <code>DynAny</code> is invalid
      */
     public void assign(org.omg.CORBA.DynAny dyn_any)
         throws org.omg.CORBA.DynAnyPackage.Invalid;
@@ -63,8 +63,8 @@
      * object.
      *
      * @param value the <code>Any</code> object.
-     * @throws Invalid if the source <code>Any</code> object is
-     *                    empty or bad
+     * @throws org.omg.CORBA.DynAnyPackage.Invalid if the source
+     * <code>Any</code> object is empty or bad
      */
     public void from_any(org.omg.CORBA.Any value)
         throws org.omg.CORBA.DynAnyPackage.Invalid;
@@ -74,8 +74,8 @@
      * object.
      *
      * @return the <code>Any</code> object.
-     * @throws Invalid if this <code>DynAny</code> is empty or
-     *                    bad.
+     * @throws org.omg.CORBA.DynAnyPackage.Invalid if this
+     * <code>DynAny</code> is empty or bad.
      *            created or does not contain a meaningful value
      */
     public org.omg.CORBA.Any to_any()
diff -r fdd3914e481e -r 47e9512ea427 corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java	Thu Jun 18 01:43:08 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynArray.java	Thu Jun 18 10:24:57 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -48,7 +48,8 @@
      * <code>DynArray</code> object to the given array.
      *
      * @param value the array of <code>Any</code> objects
-     * @exception InvalidSeq if the sequence is bad
+     * @exception org.omg.CORBA.DynAnyPackage.InvalidSeq if the
+     * sequence is bad
          * @see #get_elements
      */
     public void set_elements(org.omg.CORBA.Any[] value)
diff -r fdd3914e481e -r 47e9512ea427 corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java	Thu Jun 18 01:43:08 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/DynSequence.java	Thu Jun 18 10:24:57 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -65,7 +65,8 @@
          * array.
      *
      * @param value the array of <code>Any</code> objects to be set
-     * @exception InvalidSeq if the array of values is bad
+     * @exception org.omg.CORBA.DynAnyPackage.InvalidSeq if the array
+     * of values is bad
          * @see #get_elements
      */
     public void set_elements(org.omg.CORBA.Any[] value)
diff -r fdd3914e481e -r 47e9512ea427 corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java
--- a/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java	Thu Jun 18 01:43:08 2015 -0700
+++ b/corba/src/java.corba/share/classes/org/omg/CORBA/ServerRequest.java	Thu Jun 18 10:24:57 2015 -0700
@@ -248,7 +248,7 @@
      * contain an exception will result in a BAD_PARAM system exception. Passing
      * in an unlisted user exception will result in either the DIR receiving a
      * BAD_PARAM system exception or in the client receiving an
-     * UNKNOWN_EXCEPTION system exception.
+     * UNKNOWN system exception.
      *
      * @param any       the <code>Any</code> object containing the exception
      * @deprecated use set_exception()
@@ -272,13 +272,13 @@
      * will cause a BAD_PARAM system exception to be thrown. Passing
      * in an unlisted user exception will result in either the DIR receiving a
      * BAD_PARAM system exception or in the client receiving an
-     * UNKNOWN_EXCEPTION system exception.
+     * UNKNOWN system exception.
      *
      * @param any       the <code>Any</code> object containing the exception
      * @exception BAD_PARAM if the given <code>Any</code> object does not
      *                      contain an exception or the exception is an
      *                      unlisted user exception
-     * @exception UNKNOWN_EXCEPTION if the given exception is an unlisted
+     * @exception UNKNOWN if the given exception is an unlisted
      *                              user exception and the DIR did not
      *                              receive a BAD_PARAM exception
      * @see <a href="package-summary.html#unimpl"><code>CORBA</code>