expect newer jdk by default

This commit is contained in:
Eugene Zhuravlev
2012-04-12 14:27:58 +02:00
parent 77c5b6bf3a
commit 6eed455302
2 changed files with 6 additions and 3 deletions
@@ -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);
@@ -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");