From 7dd0aaa430daf6bd44ce655bd9c5391e741dac1d Mon Sep 17 00:00:00 2001
From: Chris Plummer <cjplummer@openjdk.org>
Date: Sat, 22 Sep 2018 14:12:48 -0700
Subject: [PATCH] 8210987: Extra newlines on Windows when running nsk jdb tests

Fix skipping over newlines

Reviewed-by: dholmes, jcbeyler, amenkov
---
 test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Jdb.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Jdb.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Jdb.java
index f8af1f38ba3..78130d2813d 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Jdb.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdb/Jdb.java
@@ -291,7 +291,7 @@ public class Jdb extends LocalProcess implements Finalizable {
                 jdbCommand += lineSeparator;
             } else {
                 // we don't want to log the line separator
-                logCmd = jdbCommand.substring(0, jdbCommand.length() - 1);
+                logCmd = jdbCommand.substring(0, jdbCommand.length() - lineSeparator.length());
             }
             launcher.getLog().display("Sending command: " + logCmd);
 
@@ -698,7 +698,7 @@ public class Jdb extends LocalProcess implements Finalizable {
             int i = string.indexOf(lineSeparator, ind);
             if (i >= 0) {
                 v.add(string.substring(ind, i));
-                ind = i + 1;
+                ind = i + lineSeparator.length();
             } else {
                 v.add(string.substring(ind));
                 break;