Blind attempt to fix 'AssertionError: Already disposed: Project'

ashald · May 22, 2019 · d28e5be · d28e5be
1 parent 9dcf88e
commit d28e5be
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning].
 
+## 3.1.2 - 2019-05-21
+
+### Fixed
+
+- Try to recover from `AssertionError: Already disposed: Project`, reported via email and in ([#83])
+
 ## 3.1.1 - 2019-04-24
 
 ### Fixed
@@ -99,6 +105,7 @@ This project adheres to [Semantic Versioning].
 [#70]: https://github.com/Ashald/EnvFile/issues/70
 [#72]: https://github.com/Ashald/EnvFile/issues/72
 [#81]: https://github.com/Ashald/EnvFile/issues/81
+[#81]: https://github.com/Ashald/EnvFile/issues/83
 
 [Keep a CHANGELOG]:     http://keepachangelog.com
 [Semantic Versioning]:  http://semver.org/

diff --git a/modules/platform/src/main/java/net/ashald/envfile/platform/EnvFileEntry.java b/modules/platform/src/main/java/net/ashald/envfile/platform/EnvFileEntry.java
@@ -105,7 +105,12 @@ private File getFile() {
         }
         String resolvedPath = path;
         if (!FileUtil.isAbsolute(resolvedPath)) {
-            VirtualFile virtualFile = runConfig.getProject().getBaseDir().findFileByRelativePath(resolvedPath);
+            VirtualFile virtualFile;
+            try {
+                virtualFile = runConfig.getProject().getBaseDir().findFileByRelativePath(resolvedPath);
+            } catch (AssertionError ignored) { // can bee thrown deep from IoC implementation
+                virtualFile = null;
+            }
             if (virtualFile != null) {
                 resolvedPath = virtualFile.getPath();
             }

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -38,13 +38,13 @@
     ]]></description>
 
   <change-notes><![CDATA[
-      <a href="https://github.com/Ashald/EnvFile/tree/v3.1.1"><b>v3.1.1</b></a> (2019-04-24)
+      <a href="https://github.com/Ashald/EnvFile/tree/v3.1.2"><b>v3.1.2</b></a> (2019-05-21)
       <br/>
       <br/>
 
       <b>Fixed</b>:
       <ul>
-        <li>Substitute parent process env vars in IDEA - wasn't working before</li>
+        <li>Try to recover from 'AssertionError: Already disposed: Project', reported via email and in</li>
       </ul>
       <br/>
       <br/>