From 18b7ea11fdc3486af04b5e4fa4e708b5b0d0d523 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 16 Oct 2012 16:16:00 +0200 Subject: [PATCH] do not override default values if corresponding attributes is missing from the xml --- .../java/impl/compiler/ProcessorConfigProfileImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ProcessorConfigProfileImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ProcessorConfigProfileImpl.java index 3ee4e8b9f045..c7a1403441fe 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ProcessorConfigProfileImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/compiler/ProcessorConfigProfileImpl.java @@ -113,14 +113,11 @@ public final class ProcessorConfigProfileImpl implements ProcessorConfigProfile @Override public void setGeneratedSourcesDirectoryName(@Nullable String name, boolean forTests) { - if (name == null || name.trim().isEmpty()) { - name = ""; - } if (forTests) { - myGeneratedTestsDirectoryName = name; + myGeneratedTestsDirectoryName = name != null? name.trim() : DEFAULT_TESTS_DIR_NAME; } else { - myGeneratedProductionDirectoryName = name; + myGeneratedProductionDirectoryName = name != null? name.trim() : DEFAULT_PRODUCTION_DIR_NAME; } }