From 31cc09bd3207dc713ae487f73500e177ae99cff7 Mon Sep 17 00:00:00 2001 From: rstevens Date: Fri, 15 Jul 2016 22:36:46 +0300 Subject: [PATCH] 8160941: "text/uri-list" dataflavor concats the first two strings Reviewed-by: mcherkas, alexsch --- src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java | 3 +-- .../MacOsXFileAndMultipleFileCopingTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java b/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java index 429a39513..73a88753a 100644 --- a/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java +++ b/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java @@ -147,8 +147,7 @@ public class CDataTransferer extends DataTransferer { String separator = System.getProperty("line.separator"); StringBuilder sb = new StringBuilder(); if(strings.length > 0) { - sb.append(strings[0]); - for(int i = 1; i < strings.length; i++) { + for(int i = 0; i < strings.length; i++) { sb.append(strings[i]); sb.append(separator); } diff --git a/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java b/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java index 18b70121a..eaa13646c 100644 --- a/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java +++ b/test/java/awt/datatransfer/DataFlavor/MacOsXFileAndMultipleFileCopingTest/MacOsXFileAndMultipleFileCopingTest.java @@ -23,7 +23,7 @@ /* @test - @bug 8081787 8136763 + @bug 8081787 8136763 8160941 @author Mikhail Cherkasov @run main/manual MacOsXFileAndMultipleFileCopingTest */ -- GitLab