Attachment 234505 Details for Bug 415269 – proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed patch

415269.patch (text/plain), 1.67 KB, created by Till Brychcy

on 2013-08-16 19:19:50 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Till Brychcy

Created: 2013-08-16 19:19:50 EDT

Size: 1.67 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
>index 3ba4370..5d51116 100644
>--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
>+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java
>@@ -21,6 +21,8 @@
>  *								bug 388281 - [compiler][null] inheritance of null annotations as an option
>  *								bug 331649 - [compiler][null] consider null annotations for fields
>  *								bug 380896 - [compiler][null] Enum constants not recognised as being NonNull.
>+ *     Till Brychcy - Contributions for
>+ *     							bug 415269 - NonNullByDefault is not always inherited to embedded classes
>  *******************************************************************************/
> package org.eclipse.jdt.internal.compiler.lookup;
> 
>@@ -1726,6 +1728,7 @@
> 
> // return: should caller continue searching?
> protected boolean checkRedundantNullnessDefaultOne(ASTNode location, Annotation[] annotations, long annotationTagBits) {
>+	initializeNullDefault();
> 	int thisDefault = this.defaultNullness;
> 	if (thisDefault == NONNULL_BY_DEFAULT) {
> 		if ((annotationTagBits & TagBits.AnnotationNonNullByDefault) != 0) {
>@@ -1756,6 +1759,7 @@
> 			case Scope.CLASS_SCOPE:
> 				currentType = ((ClassScope)currentScope).referenceContext.binding;
> 				if (currentType != null) {
>+					currentType.initializeNullDefault();
> 					int foundDefaultNullness = currentType.defaultNullness;
> 					if (foundDefaultNullness != NO_NULL_DEFAULT) {
> 						return foundDefaultNullness == NONNULL_BY_DEFAULT;

Actions: View | Diff

Attachments on bug 415269: 234505 | 234679