Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2014-10-24 18:48:44 +04:00
2 changed files with 3 additions and 1 deletions
Binary file not shown.
+3 -1
View File
@@ -208,7 +208,9 @@ NSString *requiredJvmVersion() {
}
BOOL satisfies(NSString *vmVersion, NSString *requiredVersion) {
javaUpdateRequired = isJavaUpdateRequired(vmVersion, requiredVersion);
if (!javaUpdateRequired){
javaUpdateRequired = isJavaUpdateRequired(vmVersion, requiredVersion);
}
if (javaUpdateRequired){
return !javaUpdateRequired;
}