*** old/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java	Fri Sep  9 14:15:50 2011
--- new/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java	Fri Sep  9 14:15:50 2011

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2003, 2011, 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.

*** 49,65 ****
--- 49,57 ----
        // Attempt to handle "-h" or "-help"
        if (args[0].startsWith("-")) {
           usage();
        }
  
        // By default, SA agent classes prefer dbx debugger to proc debugger
        // and Windows process debugger to windbg debugger. SA expects
        // special properties to be set to choose other debuggers. For SA/JDI,
        // we choose proc, windbg debuggers instead of the defaults.
  
        System.setProperty("sun.jvm.hotspot.debugger.useProcDebugger", "true");
        System.setProperty("sun.jvm.hotspot.debugger.useWindbgDebugger", "true");
  
        // delegate to the actual SA debug server.
        sun.jvm.hotspot.DebugServer.main(args);
     }
  }