From d130ba30dc0005aab6eb3035e2870004437616aa Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 25 Jan 2012 17:37:51 +0100 Subject: [PATCH] fix encoding check --- .../src/org/jetbrains/jps/incremental/java/JavaBuilder.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java index 55382b5c6139..1be97a81fcf4 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java @@ -6,6 +6,7 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.uiDesigner.compiler.*; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.lw.CompiledClassPropertiesProvider; @@ -436,7 +437,7 @@ public class JavaBuilder extends Builder{ } } - if (!isEncodingSet && project.getProjectCharset() != null) { + if (!isEncodingSet && !StringUtil.isEmpty(project.getProjectCharset())) { options.add("-encoding"); options.add(project.getProjectCharset()); }