From e92b1793d18a2e1344fde2cbe3034ff92833f314 Mon Sep 17 00:00:00 2001
From: d-millar <33498836+d-millar@users.noreply.github.com>
Date: Thu, 7 Jul 2022 20:25:11 +0000
Subject: [PATCH] GP-2303: fixes

---
 .../agent/dbgmodel/model/impl/DbgModel2TargetObjectImpl.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DbgModel2TargetObjectImpl.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DbgModel2TargetObjectImpl.java
index ead97cf1a3..5f4f4aad84 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DbgModel2TargetObjectImpl.java
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/main/java/agent/dbgmodel/model/impl/DbgModel2TargetObjectImpl.java
@@ -227,7 +227,7 @@ public class DbgModel2TargetObjectImpl extends DefaultTargetObject<TargetObject,
 		}
 		if (value != null && !value.equals("")) {
 			attrs.put(VALUE_ATTRIBUTE_NAME, value);
-			if (!kind.equals(ModelObjectKind.OBJECT_PROPERTY_ACCESSOR)) {
+			if (!Objects.equals(kind, ModelObjectKind.OBJECT_PROPERTY_ACCESSOR)) {
 				synchronized (attributes) {
 					String oldval = (String) attributes.get(DISPLAY_ATTRIBUTE_NAME);
 					String newval = getName() + " : " + value;
@@ -419,9 +419,6 @@ public class DbgModel2TargetObjectImpl extends DefaultTargetObject<TargetObject,
 
 	@Override
 	public DbgModelTargetSession getParentSession() {
-		if (this instanceof DbgModelTargetSession) {
-			return (DbgModelTargetSession) this;
-		}
 		DbgModelTargetObject test = (DbgModelTargetObject) parent;
 		while (test != null && !(test.getProxy() instanceof DbgModelTargetSession)) {
 			test = (DbgModelTargetObject) test.getParent();