test/langtools/tools/lib/toolbox/ToolBox.java

*** 1,7 ****
  /*
!  * Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 140,150 ****
              if (l2 == null)
                  throw new Error("comparison failed: l2 is null");
              // report first difference
              for (int i = 0; i < Math.min(l1.size(), l2.size()); i++) {
                  String s1 = l1.get(i);
!                 String s2 = l1.get(i);
                  if (!Objects.equals(s1, s2)) {
                      throw new Error("comparison failed, index " + i +
                              ", (" + s1 + ":" + s2 + ")");
                  }
              }
--- 140,150 ----
              if (l2 == null)
                  throw new Error("comparison failed: l2 is null");
              // report first difference
              for (int i = 0; i < Math.min(l1.size(), l2.size()); i++) {
                  String s1 = l1.get(i);
!                 String s2 = l2.get(i);
                  if (!Objects.equals(s1, s2)) {
                      throw new Error("comparison failed, index " + i +
                              ", (" + s1 + ":" + s2 + ")");
                  }
              }