EA-90388 - NPE: RefactoringListeners$ClassPackageAccessor.<init>

This commit is contained in:
Anna.Kozlova
2016-10-24 12:31:29 +02:00
parent c7c1af9656
commit 5393cf3715
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -193,8 +193,8 @@ public class RefactoringListeners {
myContainingPackage = JavaDirectoryService.getInstance().getPackage(aClass.getContainingFile().getContainingDirectory());
myModule = JavaExecutionUtil.findModule(aClass);
final String classQName = aClass.getQualifiedName();
final String classPackageQName = myContainingPackage.getQualifiedName();
if (classQName.startsWith(classPackageQName)) {
final String classPackageQName = myContainingPackage != null ? myContainingPackage.getQualifiedName() : null;
if (classQName != null && classPackageQName != null && classQName.startsWith(classPackageQName)) {
final String inpackageName = classQName.substring(classPackageQName.length());
if (StringUtil.startsWithChar(inpackageName, '.')) {
myInpackageName = inpackageName.substring(1);