From 6d9a6a6bfa32ed2ec5ff52521a86e2cad4985d4e Mon Sep 17 00:00:00 2001 From: Alexander Bubenchikov Date: Tue, 4 Jun 2019 18:26:27 +0300 Subject: [PATCH] fix checking for bad configs GitOrigin-RevId: 1c51f1ed5f8f498b010a72009aa3e1cc9694d0fd --- .../jetbrains/idea/maven/server/Maven3XServerEmbedder.java | 2 +- .../org/jetbrains/idea/maven/project/MavenProjectsTree.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java index 7ef17054b839..807ff5247afe 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3XServerEmbedder.java @@ -210,7 +210,7 @@ public abstract class Maven3XServerEmbedder extends Maven3ServerEmbedder { //noinspection SSBasedInspection cliRequest = constructor.newInstance(commandLineOptions.toArray(new String[0]), classWorld); - for (String each : new String[]{"initialize", "cli", "logging", "properties", "populateRequest"}) { + for (String each : new String[]{"initialize", "cli", "logging", "properties"}) { Method m = MavenCli.class.getDeclaredMethod(each, cliRequestClass); m.setAccessible(true); m.invoke(cli, cliRequest); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java index 7e73967a7428..d03321379857 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java @@ -1271,9 +1271,9 @@ public class MavenProjectsTree { mavenProject.setConfigFileError(cause.getMessage()); } } - throw cause; + } else { + throw t; } - throw t; } finally { embeddersManager.release(embedder);