test/jdk/com/sun/jdi/TestScaffold.java

*** 1,7 ****
  /*
!  * Copyright (c) 2001, 2013, 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) 2001, 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.
*** 782,796 ****
      public StepEvent stepOut(ThreadReference thread) {
          return doStep(thread, StepRequest.STEP_LINE, StepRequest.STEP_OUT);
      }
  
      public BreakpointEvent resumeTo(Location loc) {
          final BreakpointRequest request =
              requestManager.createBreakpointRequest(loc);
          request.addCountFilter(1);
          request.enable();
!         return (BreakpointEvent)waitForRequestedEvent(request);
      }
  
      public ReferenceType findReferenceType(String name) {
          List rts = vm.classesByName(name);
          Iterator iter = rts.iterator();
--- 782,803 ----
      public StepEvent stepOut(ThreadReference thread) {
          return doStep(thread, StepRequest.STEP_LINE, StepRequest.STEP_OUT);
      }
  
      public BreakpointEvent resumeTo(Location loc) {
+         return resumeTo(loc, false);
+     }
+ 
+     public BreakpointEvent resumeTo(Location loc, boolean suspendThread) {
          final BreakpointRequest request =
                  requestManager.createBreakpointRequest(loc);
          request.addCountFilter(1);
+         if (suspendThread) {
+             request.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
+         }
          request.enable();
!         return (BreakpointEvent) waitForRequestedEvent(request);
      }
  
      public ReferenceType findReferenceType(String name) {
          List rts = vm.classesByName(name);
          Iterator iter = rts.iterator();
*** 843,858 ****
  
          return resumeTo(method.location());
      }
  
      public BreakpointEvent resumeTo(String clsName, int lineNumber) throws AbsentInformationException {
          ReferenceType rt = findReferenceType(clsName);
          if (rt == null) {
              rt = resumeToPrepareOf(clsName).referenceType();
          }
  
!         return resumeTo(findLocation(rt, lineNumber));
      }
  
      public ClassPrepareEvent resumeToPrepareOf(String className) {
          final ClassPrepareRequest request =
              requestManager.createClassPrepareRequest();
--- 850,869 ----
  
          return resumeTo(method.location());
      }
  
      public BreakpointEvent resumeTo(String clsName, int lineNumber) throws AbsentInformationException {
+         return resumeTo(clsName, lineNumber, false);
+     }
+ 
+     public BreakpointEvent resumeTo(String clsName, int lineNumber, boolean suspendThread) throws AbsentInformationException {
          ReferenceType rt = findReferenceType(clsName);
          if (rt == null) {
              rt = resumeToPrepareOf(clsName).referenceType();
          }
  
!         return resumeTo(findLocation(rt, lineNumber), suspendThread);
      }
  
      public ClassPrepareEvent resumeToPrepareOf(String className) {
          final ClassPrepareRequest request =
              requestManager.createClassPrepareRequest();