From 1f8eb3cc2fe8c0bdd449fe17e997ec6b1e98e1b1 Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 25 Jan 2012 14:43:12 +0400 Subject: [PATCH] SVN 1.7: check javaHL version only if flag is set --- .../src/org/jetbrains/idea/svn17/CheckJavaHL.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/CheckJavaHL.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/CheckJavaHL.java index 5d3617c43109..bac1697c913d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/CheckJavaHL.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/CheckJavaHL.java @@ -30,6 +30,7 @@ import org.apache.subversion.javahl.types.Version; */ public class CheckJavaHL { public static final String VERSION_CLASS = "org.apache.subversion.javahl.types.Version"; + public static final String CHECK_JAVAHL_VERSION = "svn.check.javahl.version"; private static boolean ourIsPresent; private static String ourProblemDescription; @@ -56,10 +57,13 @@ public class CheckJavaHL { private static boolean checkVersion(Class aClass) { try { Version v = (Version)aClass.newInstance(); - //boolean atLeast = true; - boolean atLeast = v.isAtLeast(1, 7, 0); - if (! atLeast) { - ourProblemDescription = "JavaHL library version is old: " + v.toString(); + boolean atLeast = true; + Boolean check = Boolean.getBoolean(CHECK_JAVAHL_VERSION); + if (Boolean.TRUE.equals(check)) { + atLeast = v.isAtLeast(1, 7, 0); + if (! atLeast) { + ourProblemDescription = "JavaHL library version is old: " + v.toString(); + } } return atLeast; }