From cbc614c4cd3b5befff2a73cb623c81a742b87326 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:42:39 -0500
Subject: [PATCH] GP-0: Fix rare race condition causing NPE.

---
 .../plugin/core/debug/gui/model/AbstractQueryTableModel.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java
index a027941763..fced80404e 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/model/AbstractQueryTableModel.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -302,6 +302,7 @@ public abstract class AbstractQueryTableModel<T> extends ThreadedTableModel<T, T
 	@Override
 	protected void doLoad(Accumulator<T> accumulator, TaskMonitor monitor)
 			throws CancelledException {
+		Trace trace = this.trace;
 		if (trace == null || query == null || trace.getObjectManager().getRootSchema() == null) {
 			return;
 		}