From e3bfaeb257fcf9cde859a50f075ddc7152926d27 Mon Sep 17 00:00:00 2001
From: Sergey Savenko <sergey.savenko@jetbrains.com>
Date: Thu, 5 Nov 2015 15:36:34 +0300
Subject: [PATCH] DBE-1754: associate versions with plugin id regardless of
 whether a plugin is bundled

ResourceVersions maps plugin ids to their versions. For bundled plugins, core plugin id was used.
Core plugin class loader doesn't have bundled plugin resources on it's classpath, when running on
 production jars.

 This led to a version being updated on attempt to run startup scripts, while no resources were
 extracted. Further checks on whether resources should be extracted were failing.
---
 .../com/intellij/ide/extensionResources/ResourceVersions.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/extensionResources/ResourceVersions.java b/platform/lang-impl/src/com/intellij/ide/extensionResources/ResourceVersions.java
index 098c65746b04..af3f1b6d99cb 100644
--- a/platform/lang-impl/src/com/intellij/ide/extensionResources/ResourceVersions.java
+++ b/platform/lang-impl/src/com/intellij/ide/extensionResources/ResourceVersions.java
@@ -100,8 +100,10 @@ class ResourceVersions implements PersistentStateComponent<ResourceVersions.Stat
       return null;
     }
 
+    @NotNull
     private static String getId(@NotNull IdeaPluginDescriptor plugin) {
-      return plugin.isBundled() ? PluginManagerCore.CORE_PLUGIN_ID : plugin.getPluginId().getIdString();
+      PluginId pluginId = plugin.getPluginId();
+      return pluginId != null ? pluginId.getIdString() : PluginManagerCore.CORE_PLUGIN_ID;
     }
 
     @NotNull