From c88b64939ffdf246f8a100fd83db3e7645488430 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 14 Nov 2013 11:40:00 +0100 Subject: [PATCH] return back custom maven index restoration upon corruption, only avoid logging exception when persistent enumerator version was upgraded --- .../org/jetbrains/idea/maven/indices/MavenIndex.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java index 9a933d3bbfd7..614332fcadd4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java @@ -154,7 +154,9 @@ public class MavenIndex { doOpen(); } catch (Exception e1) { - MavenLog.LOG.warn(e1); + final boolean versionUpdated = e1.getCause() instanceof PersistentEnumeratorBase.VersionUpdatedException; + if (!versionUpdated) MavenLog.LOG.warn(e1); + try { doOpen(); } @@ -619,12 +621,7 @@ public class MavenIndex { } private PersistentHashMap> createPersistentMap(final File f) throws IOException { - return IOUtil.openCleanOrResetBroken(new ThrowableComputable>, IOException>() { - @Override - public PersistentHashMap> compute() throws IOException { - return new PersistentHashMap>(f, new EnumeratorStringDescriptor(), new SetDescriptor()); - } - }, f); + return new PersistentHashMap>(f, new EnumeratorStringDescriptor(), new SetDescriptor()); } public void close(boolean releaseIndexContext) throws MavenIndexException {