From 6be9fb1017e8cdd9101d81d283ffe491dc68b330 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 27 Sep 2012 16:49:01 +0400 Subject: [PATCH] EA-39553 - NPE: AlternativeSignatureData. --- .../jet/lang/resolve/java/kt/JetClassAnnotation.java | 5 ++++- .../jet/lang/resolve/java/kt/JetConstructorAnnotation.java | 4 +++- .../jet/lang/resolve/java/kt/JetMethodAnnotation.java | 5 ++++- .../jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java | 4 +++- .../lang/resolve/java/kt/JetValueParameterAnnotation.java | 4 +++- .../jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java | 4 ++++ 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java index 811bf01b4c4..5b5c18b0568 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetClassAnnotation.java @@ -27,8 +27,11 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; * @author Stepan Koltsov */ public class JetClassAnnotation extends PsiAnnotationWithFlags { - public static final JetClassAnnotation NULL_ANNOTATION = new JetClassAnnotation(null); + static { + NULL_ANNOTATION.checkInitialized(); + } + private String signature; public JetClassAnnotation(@Nullable PsiAnnotation psiAnnotation) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java index e356e8d2c6f..a4115d13557 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetConstructorAnnotation.java @@ -26,8 +26,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; * @author Stepan Koltsov */ public class JetConstructorAnnotation extends PsiAnnotationWithFlags { - public static final JetConstructorAnnotation NULL_ANNOTATION = new JetConstructorAnnotation(null); + static { + NULL_ANNOTATION.checkInitialized(); + } public JetConstructorAnnotation(@Nullable PsiAnnotation psiAnnotation) { super(psiAnnotation); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java index 6a2b8176ddd..d27ad0e0fc4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetMethodAnnotation.java @@ -28,8 +28,11 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; * @author alex.tkachman */ public class JetMethodAnnotation extends PsiAnnotationWithFlags { - public static final JetMethodAnnotation NULL_ANNOTATION = new JetMethodAnnotation(null); + static { + NULL_ANNOTATION.checkInitialized(); + } + private String typeParameters; private String returnType; private String propertyType; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java index 69931123bc3..8cc7aa5604a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetTypeParameterAnnotation.java @@ -27,8 +27,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; * @author Stepan Koltsov */ public class JetTypeParameterAnnotation extends PsiAnnotationWrapper { - public static final JetTypeParameterAnnotation NULL_ANNOTATION = new JetTypeParameterAnnotation(null); + static { + NULL_ANNOTATION.checkInitialized(); + } protected JetTypeParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) { super(psiAnnotation); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java index 9bd694cf5b0..f360b2eca76 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/JetValueParameterAnnotation.java @@ -28,8 +28,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; * @author alex.tkachman */ public class JetValueParameterAnnotation extends PsiAnnotationWrapper { - public static final JetValueParameterAnnotation NULL_ANNOTATION = new JetValueParameterAnnotation(null); + static { + NULL_ANNOTATION.checkInitialized(); + } public JetValueParameterAnnotation(@Nullable PsiAnnotation psiAnnotation) { super(psiAnnotation); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java index 4828e53745c..eb3d961be56 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kt/KotlinSignatureAnnotation.java @@ -30,6 +30,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; */ public class KotlinSignatureAnnotation extends PsiAnnotationWrapper { public static final KotlinSignatureAnnotation NULL_ANNOTATION = new KotlinSignatureAnnotation(null); + static { + NULL_ANNOTATION.checkInitialized(); + } + private String signature; public KotlinSignatureAnnotation(@Nullable PsiAnnotation psiAnnotation) {