From 3a1451abf385ca75fa95e4c22f7583e11861eeba Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Fri, 13 Jul 2012 15:28:14 +0200 Subject: [PATCH] do not load snappy implementation if its usage is explicitly disabled via system property --- .../src/com/intellij/util/indexing/IOUtils.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/util/indexing/IOUtils.java b/platform/lang-impl/src/com/intellij/util/indexing/IOUtils.java index 783c4a8cb08f..85064910d31d 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/IOUtils.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/IOUtils.java @@ -31,9 +31,14 @@ public class IOUtils { private static volatile boolean canUseSnappy; static { try { - Field impl = Snappy.class.getDeclaredField("impl"); - impl.setAccessible(true); - canUseSnappy = impl.get(null) != null && System.getProperty("idea.no.snappy") == null; + if (System.getProperty("idea.no.snappy") == null) { // if enabled + Field impl = Snappy.class.getDeclaredField("impl"); + impl.setAccessible(true); + canUseSnappy = impl.get(null) != null; + } + else { + canUseSnappy = false; + } } catch (Throwable e) {} }