From 5393cf37153085f03843df6f265660973c1e79bf Mon Sep 17 00:00:00 2001 From: "Anna.Kozlova" Date: Mon, 24 Oct 2016 11:49:13 +0200 Subject: [PATCH] EA-90388 - NPE: RefactoringListeners$ClassPackageAccessor. --- .../com/intellij/execution/junit/RefactoringListeners.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java b/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java index e11c897d50fb..4e63d0c61d81 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java +++ b/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java @@ -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);