From 6eed455302bdf0aae2e95825419443565895f74a Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 12 Apr 2012 14:25:22 +0200
Subject: [PATCH] expect newer jdk by default

---
 .../com/intellij/debugger/impl/DebuggerManagerImpl.java    | 7 +++++--
 .../src/org/jetbrains/jps/javac/JavacServerBootstrap.java  | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
index ab009da13139..22713d295929 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerManagerImpl.java
@@ -496,9 +496,12 @@ public class DebuggerManagerImpl extends DebuggerManagerEx {
   }
 
   private static boolean shouldAddXdebugKey(Sdk jdk) {
-    if (jdk == null || DebuggerSettings.getInstance().DISABLE_JIT) {
+    if (DebuggerSettings.getInstance().DISABLE_JIT) {
       return true;
     }
+    if (jdk == null) {
+      return false; // assume newer jdk by default
+    }
 
     //if (ApplicationManager.getApplication().isUnitTestMode()) {
       // need this in unit tests to avoid false alarms when comparing actual output with expected output
@@ -517,7 +520,7 @@ public class DebuggerManagerImpl extends DebuggerManagerEx {
 
   private static boolean isJVMTIAvailable(Sdk jdk) {
     if (jdk == null) {
-      return false;
+      return true; // assume newer jdk by default
     }
 
     final String version = JdkUtil.getJdkMainAttribute(jdk, Attributes.Name.IMPLEMENTATION_VERSION);
diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServerBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServerBootstrap.java
index 8452f1d9b1e6..426e9b191299 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServerBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServerBootstrap.java
@@ -33,7 +33,7 @@ public class JavacServerBootstrap {
 
     // debugging
     //appendParam(cmdLine, "-XX:+HeapDumpOnOutOfMemoryError");
-    //appendParam(cmdLine, "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5009");
+    //appendParam(cmdLine, "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5009");
 
     // javac's VM should use the same default locale that IDEA uses in order for javac to print messages in 'correct' language
     final String lang = System.getProperty("user.language");