changeset 32073:93ee8f24e0a6

Merge
author dsamersoff
date Thu, 30 Jul 2015 16:23:03 +0000
parents bc13add2c295 90ad2be7c11c
children 1c9c9d5945b8
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/testlibrary/jdk/test/lib/Utils.java	Thu Jul 30 16:26:00 2015 +0300
+++ b/hotspot/test/testlibrary/jdk/test/lib/Utils.java	Thu Jul 30 16:23:03 2015 +0000
@@ -314,9 +314,8 @@
      */
     public static String fileAsString(String filename) throws IOException {
         Path filePath = Paths.get(filename);
-        return Files.exists(filePath)
-            ? Files.lines(filePath).collect(Collectors.joining(NEW_LINE))
-            : null;
+        if (!Files.exists(filePath)) return null;
+        return new String(Files.readAllBytes(filePath));
     }
 
     /**