From 34c4fe7892d4155e04ab02163b3f839318ee1a9f Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 21 Dec 2015 23:58:13 +0000 Subject: Fixes a bug for the case where a protobuf is used to supply arguments, where bundle id, if not specified, would have a value of the empty string instead of null. -- MOS_MIGRATED_REVID=110724117 --- .../devtools/build/xcode/plmerge/MergingArguments.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/objc_tools') diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java index 61d23de749..cf6373afc3 100644 --- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java +++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/MergingArguments.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.xcode.plmerge; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableMap; @@ -57,13 +58,10 @@ class MergingArguments { outFile = control.getOutFile(); variableSubstitutions = control.getVariableSubstitutionMap(); - primaryBundleId = control.getPrimaryBundleId(); - fallbackBundleId = control.getFallbackBundleId(); - if (control.hasExecutableName()) { - executableName = control.getExecutableName(); - } else { - executableName = null; - } + + primaryBundleId = Strings.emptyToNull(control.getPrimaryBundleId()); + fallbackBundleId = Strings.emptyToNull(control.getFallbackBundleId()); + executableName = Strings.emptyToNull(control.getExecutableName()); } /** -- cgit v1.2.3