From fcc3457e9b94053fafcea53dfbda4fb8e3aa1ac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 16 Aug 2017 15:22:01 +0200 Subject: [PATCH] [devkit] ExtensionPointImpl: fix possible NPE --- plugins/devkit/src/dom/impl/ExtensionPointImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/devkit/src/dom/impl/ExtensionPointImpl.java b/plugins/devkit/src/dom/impl/ExtensionPointImpl.java index 1fedbcd88265..87da011cf52f 100644 --- a/plugins/devkit/src/dom/impl/ExtensionPointImpl.java +++ b/plugins/devkit/src/dom/impl/ExtensionPointImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,9 +34,9 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { @Override public String getEffectiveName() { if (DomUtil.hasXml(getName())) { - return getName().getRawText(); + return StringUtil.notNullize(getName().getRawText()); } - return getQualifiedName().getRawText(); + return StringUtil.notNullize(getQualifiedName().getRawText()); } @Nullable @@ -56,10 +56,10 @@ public abstract class ExtensionPointImpl implements ExtensionPoint { @Override public String getEffectiveQualifiedName() { if (DomUtil.hasXml(getQualifiedName())) { - return getQualifiedName().getRawText(); + return StringUtil.notNullize(getQualifiedName().getRawText()); } - return getNamePrefix() + "." + getName().getRawText(); + return getNamePrefix() + "." + StringUtil.notNullize(getName().getRawText()); } @Override