Skip to content

Commit c683d2c

Browse files
committed
Fix NPE
Signed-off-by: Rob Stryker <[email protected]>
1 parent 01b5e37 commit c683d2c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

org.eclipse.jdt.core.javac/src/org/eclipse/jdt/internal/core/search/matching/DOMMethodLocator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,7 @@ public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch ma
13241324
boolean isMethodBinding = methodBinding != null;
13251325
boolean mbIsRaw = isMethodBinding && methodBinding.isRawMethod();
13261326
ITypeBinding declaring = isMethodBinding ? methodBinding.getDeclaringClass() : null;
1327+
boolean delcaringIsParameterized = declaring == null ? false : declaring.isParameterizedType();
13271328
boolean mbDeclaringIsRaw = isMethodBinding && declaring.isRawType();
13281329
boolean mbIsGeneric = isMethodBinding && methodBinding.isGenericMethod();
13291330
boolean mbIsParameterized = isMethodBinding && methodBinding.isParameterizedMethod();
@@ -1364,11 +1365,10 @@ public void reportSearchMatch(MatchLocator locator, ASTNode node, SearchMatch ma
13641365
match.setRule(rule);
13651366
}
13661367
if (isMethodBinding
1367-
&& (mbIsRaw || mbDeclaringIsRaw)
13681368
&& (patternHasMethodArgs || patternHasTypeArgs)) {
1369-
if( mbDeclaringIsRaw ) {
1369+
if( mbDeclaringIsRaw || delcaringIsParameterized) {
13701370
updateMatch(declaring, this.pattern.getTypeArguments(), this.pattern.hasTypeParameters(), 0);
1371-
} else {
1371+
} else if( mbIsRaw ) {
13721372
int rule = match.getRule();
13731373
rule &= ~SearchPattern.R_FULL_MATCH;
13741374
rule |= SearchPattern.R_EQUIVALENT_MATCH | SearchPattern.R_ERASURE_MATCH;

0 commit comments

Comments
 (0)