From ae1d293b4b4cb816e7d1675b0aba331de7d34cce Mon Sep 17 00:00:00 2001 From: Ivan Bessonov Date: Mon, 21 May 2018 16:36:43 +0300 Subject: [PATCH] IDEA-CR-32779 removed dead code --- .../idea/maven/server/Maven3ServerEmbedderImpl.java | 8 -------- .../idea/maven/server/Maven30ServerEmbedderImpl.java | 8 -------- 2 files changed, 16 deletions(-) diff --git a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java index 901a61bf8aa1..0890a39adf28 100644 --- a/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java +++ b/plugins/maven/maven3-server-impl/src/org/jetbrains/idea/maven/server/Maven3ServerEmbedderImpl.java @@ -652,14 +652,6 @@ public class Maven3ServerEmbedderImpl extends Maven3ServerEmbedder { final List listeners) throws RemoteException { final File file = !files.isEmpty() ? files.iterator().next() : null; final MavenExecutionRequest request = createRequest(file, activeProfiles, inactiveProfiles, null); - if (!files.isEmpty() && file == null) { // maven.config and jvm.config are not resolved in "createRequest" method - File firstFile = ContainerUtil.getFirstItem(files); - if (myUserProperties != null) { - request.getUserProperties().putAll(myUserProperties); - } - //noinspection ConstantConditions - request.getUserProperties().putAll(getMavenAndJvmConfigProperties(firstFile.getParentFile())); - } request.setUpdateSnapshots(myAlwaysUpdateSnapshots); diff --git a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java index 05cad234dae3..533e82423d7b 100644 --- a/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java +++ b/plugins/maven/maven30-server-impl/src/org/jetbrains/idea/maven/server/Maven30ServerEmbedderImpl.java @@ -633,14 +633,6 @@ public class Maven30ServerEmbedderImpl extends Maven3ServerEmbedder { final List listeners) throws RemoteException { final File file = files.size() == 1 ? files.iterator().next() : null; final MavenExecutionRequest request = createRequest(file, activeProfiles, inactiveProfiles, null); - if (!files.isEmpty() && file == null) { // maven.config and jvm.config are not resolved in "createRequest" method - File firstFile = ContainerUtil.getFirstItem(files); - if (myUserProperties != null) { - request.getUserProperties().putAll(myUserProperties); - } - //noinspection ConstantConditions - request.getUserProperties().putAll(getMavenAndJvmConfigProperties(firstFile.getParentFile())); - } request.setUpdateSnapshots(myAlwaysUpdateSnapshots);