Mercurial > hg > openjdk > lambda > jdk

changeset 10480:7c84aff91033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8027030: AWT Multiple JVM DnD Test Failing on Linux (OEL and Ubuntu) and Solaris (Sparc and x64) Reviewed-by: anthony, serb
author pchelko
date Thu, 24 Oct 2013 19:23:02 +0400
parents cd2e3c63ee42
children c561db53a24c
files src/share/classes/sun/awt/datatransfer/DataTransferer.java
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java	Thu Oct 24 14:32:07 2013 +0400
+++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java	Thu Oct 24 19:23:02 2013 +0400
@@ -1674,6 +1674,15 @@
                 theObject = translateStream(bais, flavor, format, localeTransferable);
             }
 
+        } else if (flavor.isRepresentationClassRemote()) {
+            try (ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+                 ObjectInputStream ois = new ObjectInputStream(bais))
+            {
+                theObject = RMI.getMarshalledObject(ois.readObject());
+            } catch (Exception e) {
+                throw new IOException(e.getMessage());
+            }
+
             // Target data is Serializable
         } else if (flavor.isRepresentationClassSerializable()) {