From 464d175f29d2b7f20c568eb1eeb1d7965e788904 Mon Sep 17 00:00:00 2001 From: Vassiliy Kudryashov Date: Fri, 14 Sep 2012 16:56:38 +0400 Subject: [PATCH] IDEA-91564 NPE at com.intellij.BundleBase.replaceMnemonicAmpersand --- platform/util-rt/src/com/intellij/BundleBase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/util-rt/src/com/intellij/BundleBase.java b/platform/util-rt/src/com/intellij/BundleBase.java index 566be37adda1..beb1e83227ee 100644 --- a/platform/util-rt/src/com/intellij/BundleBase.java +++ b/platform/util-rt/src/com/intellij/BundleBase.java @@ -67,7 +67,10 @@ public abstract class BundleBase { return messageOrDefault(bundle, key, null, params); } - public static String replaceMnemonicAmpersand(final String value) { + @Nullable + public static String replaceMnemonicAmpersand(@Nullable final String value) { + if (value == null) + return null; if (value.indexOf('&') >= 0) { boolean useMacMnemonic = value.contains("&&"); StringBuilder realValue = new StringBuilder();