Mercurial > hg > openjdk > aarch64-port > jdk
changeset 11032:c02db16cc5f0
8130752: Wrong changes were pushed with 8068886
Reviewed-by: serb, alexsch
author | mcherkas |
---|---|
date | Thu, 09 Jul 2015 14:51:17 +0300 |
parents | ac4dcf59ba66 |
children | 43aca4fe30e3 |
files | src/share/classes/sun/awt/datatransfer/DataTransferer.java |
diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/awt/datatransfer/DataTransferer.java Tue Jun 30 17:21:34 2015 -0400 +++ b/src/share/classes/sun/awt/datatransfer/DataTransferer.java Thu Jul 09 14:51:17 2015 +0300 @@ -2905,13 +2905,13 @@ return comp; } -// if (flavor1.isFlavorTextType()) { -// return 1; -// } -// -// if (flavor2.isFlavorTextType()) { -// return -1; -// } + if (flavor1.isFlavorTextType()) { + return 1; + } + + if (flavor2.isFlavorTextType()) { + return -1; + } // Next, look for application/x-java-* types. Prefer unknown // MIME types because if the user provides his own data flavor,