src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 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.  Oracle designates this
*** 194,214 ****
          }
          String address = listenKey.address();
  
          try {
              if (home.length() > 0) {
-                 /*
-                  * A wrinkle in the environment:
-                  * 64-bit executables are stored under $JAVA_HOME/bin/os_arch
-                  * 32-bit executables are stored under $JAVA_HOME/bin
-                  */
                  String os_arch = System.getProperty("os.arch");
!                 if ("SunOS".equals(System.getProperty("os.name")) &&
!                    ("sparcv9".equals(os_arch) || "amd64".equals(os_arch))) {
!                     exePath = home + File.separator + "bin" + File.separator +
!                         os_arch + File.separator + exe;
!                 } else {
                      exePath = home + File.separator + "bin" + File.separator + exe;
                  }
              } else {
                  exePath = exe;
              }
--- 194,205 ----
          }
          String address = listenKey.address();
  
          try {
              if (home.length() > 0) {
                  String os_arch = System.getProperty("os.arch");
!                 if ("SunOS".equals(System.getProperty("os.name"))) {
                      exePath = home + File.separator + "bin" + File.separator + exe;
                  }
              } else {
                  exePath = exe;
              }