TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed NPE for classes in toplevel package when instantiation checks were turned on

This commit is contained in:
Lars Kühne 2002-06-06 20:13:24 +00:00
parent 8af07e5dfd
commit 3a5f01cc66
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/checkstyle/com/puppycrawl/tools/checkstyle/Verifier.java
View File

@ -1442,12 +1442,16 @@ class Verifier
return aClassName;
}
final int clsNameLen = aClassName.length();
final int pkgNameLen = mPkgName.length();
final Iterator illIter = illegalInsts.iterator();
while (illIter.hasNext()) {
final String illegal = (String) illIter.next();
final int illegalLen = illegal.length();
// class from java.lang
if (((illegal.length() - javaLang.length()) == aClassName.length())
if (((illegalLen - javaLang.length()) == clsNameLen)
&& illegal.endsWith(aClassName)
&& illegal.startsWith(javaLang))
{
@ -1455,8 +1459,15 @@ class Verifier
}
// class from same package
if (illegal.length() - mPkgName.length() == aClassName.length() + 1
&& illegal.charAt(mPkgName.length()) == '.'
// the toplevel package (mPkgName == null) is covered by the
// "illegalInsts.contains(aClassName)" check above
// the test is the "no garbage" version of
// illegal.equals(mPkgName + "." + aClassName)
if (mPkgName != null
&& clsNameLen == illegalLen - pkgNameLen - 1
&& illegal.charAt(pkgNameLen) == '.'
&& illegal.endsWith(aClassName)
&& illegal.startsWith(mPkgName))
{