Skip to content

Commit 3160d74

Browse files
authored
Additional hardening in DartStaticFieldsGroup.java in an attempt to resolve issue 7228 (#7282)
#7228
1 parent 8149db9 commit 3160d74

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

flutter-idea/src/io/flutter/vmService/frame/DartStaticFieldsGroup.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public void computeChildren(@NotNull final XCompositeNode node) {
5757
public void received(Obj field) {
5858
final InstanceRef instanceRef = ((Field)field).getStaticValue();
5959
// static field may be not initialized yet, in this case this instanceRef is in fact a Sentinel
60-
if ("@Instance".equals(instanceRef.getType())) {
60+
if (instanceRef != null && "@Instance".equals(instanceRef.getType())) {
6161
list.add(new DartVmServiceValue(myDebugProcess, myIsolateId, ((Field)field).getName(), instanceRef, null, fieldRef, false));
6262
}
63-
else if ("Sentinel".equals(instanceRef.getType())) {
63+
else if (instanceRef != null && "Sentinel".equals(instanceRef.getType())) {
6464
list.add(new XNamedValue(((Field)field).getName()) {
6565
@Override
6666
public void computeSourcePosition(@NotNull XNavigatable navigatable) {

0 commit comments

Comments
 (0)