Mercurial > hg > release > icedtea7-forest-2.1 > jdk
changeset 4654:35a7ac263804
Merge
author | vinnie |
---|---|
date | Fri, 14 Oct 2011 16:52:00 +0100 |
parents | 3bf3f68bbe56 (current diff) 6700239b1c19 (diff) |
children | 77c52b19c27d 25df27523672 |
files | |
diffstat | 2 files changed, 1 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/awt/AWTKeyStroke.java Fri Oct 14 15:31:14 2011 +0100 +++ b/src/share/classes/java/awt/AWTKeyStroke.java Fri Oct 14 16:52:00 2011 +0100 @@ -777,10 +777,6 @@ */ protected Object readResolve() throws java.io.ObjectStreamException { synchronized (AWTKeyStroke.class) { - Class newClass = getClass(); - if (!newClass.equals(ctor.getDeclaringClass())) { - registerSubclass(newClass); - } return getCachedStroke(keyChar, keyCode, modifiers, onKeyRelease); } }
--- a/src/windows/classes/sun/awt/windows/WDataTransferer.java Fri Oct 14 15:31:14 2011 +0100 +++ b/src/windows/classes/sun/awt/windows/WDataTransferer.java Fri Oct 14 16:52:00 2011 +0100 @@ -205,7 +205,7 @@ bytes = null; } - str = new HTMLCodec(str, EHTMLReadMode.HTML_READ_SELECTION); + str = new HTMLCodec(str, EHTMLReadMode.HTML_READ_ALL); } if (format == CF_FILEGROUPDESCRIPTORA || format == CF_FILEGROUPDESCRIPTORW) {