From 9d0e3e09bef36a8d16d7a54bdb3f9ed176a8efe3 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 10 Feb 2020 14:26:18 +0100 Subject: [PATCH] fix NPE GitOrigin-RevId: 569558f7643499dee8c1b1cb210037dbe32223bc --- .../src/org/jetbrains/jps/javac/ast/api/JavacFileData.java | 3 ++- .../src/org/jetbrains/jps/javac/ast/api/JavacRef.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java index 395c54876fcf..cee88472b3c0 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacFileData.java @@ -206,7 +206,8 @@ public class JavacFileData { out.writeByte(FIELD_MARKER); out.writeUTF(((JavacRef.JavacField)ref).getContainingClass()); out.writeUTF(ref.getOwnerName()); - out.writeUTF(((JavacRef.JavacField)ref).getDescriptor()); + final String descriptor = ((JavacRef.JavacField)ref).getDescriptor(); + out.writeUTF(descriptor == null? "" : descriptor); } else if (ref instanceof JavacRef.JavacMethod) { out.writeByte(METHOD_MARKER); diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java index 745b45618b69..75758c202eba 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/ast/api/JavacRef.java @@ -166,7 +166,7 @@ public interface JavacRef { super(name, modifiers); myContainingClassName = containingClassName; myOwnerName = ownerName; - myDescriptor = descriptor; + myDescriptor = descriptor != null && !descriptor.isEmpty()? descriptor : null; } @Override