From 5453aabfaf51153bc5088869b6c0586e12e98cb1 Mon Sep 17 00:00:00 2001
From: d-millar <33498836+d-millar@users.noreply.github.com>
Date: Thu, 23 Sep 2021 17:49:41 +0000
Subject: [PATCH] GP-1288: support for dbgmodel

---
 .../DbgModelTargetDebugContainerImpl.java     |  4 ++--
 .../model/impl/DbgModel2TargetObjectImpl.java | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetDebugContainerImpl.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetDebugContainerImpl.java
index e61f5ad972..b09f64641c 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetDebugContainerImpl.java
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/impl/DbgModelTargetDebugContainerImpl.java
@@ -48,8 +48,8 @@ public class DbgModelTargetDebugContainerImpl extends DbgModelTargetObjectImpl
 		implements DbgModelTargetDebugContainer {
 
 	protected final DbgModelTargetBreakpointContainerImpl breakpoints;
-	protected final DbgModelTargetEventContainerImpl events;
-	protected final DbgModelTargetExceptionContainerImpl exceptions;
+	protected DbgModelTargetEventContainerImpl events;
+	protected DbgModelTargetExceptionContainerImpl exceptions;
 
 	private DbgModelTargetProcess process;
 
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 74b43594a5..67cfa33ca0 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
@@ -319,6 +319,27 @@ public class DbgModel2TargetObjectImpl extends DefaultTargetObject<TargetObject,
 				DbgModelTargetTTD ttd = (DbgModelTargetTTD) proxy;
 				return ttd.init(attrs);
 			}
+			if (proxy instanceof DbgModelTargetDebugContainer) {
+				DbgModelTargetEventContainer events;
+				if (attributes.containsKey("Events")) {
+					events = (DbgModelTargetEventContainer) attributes.get("Events");
+				}
+				else {
+					events =
+						new DbgModelTargetEventContainerImpl((DbgModelTargetDebugContainer) proxy);
+				}
+				attrs.put(events.getName(), events);
+				DbgModelTargetExceptionContainer exceptions;
+				if (attributes.containsKey("Exceptions")) {
+					exceptions = (DbgModelTargetExceptionContainer) attributes.get("Exceptions");
+				}
+				else {
+					exceptions =
+						new DbgModelTargetExceptionContainerImpl(
+							(DbgModelTargetDebugContainer) proxy);
+				}
+				attrs.put(exceptions.getName(), exceptions);
+			}
 		}
 
 		return CompletableFuture.completedFuture(null);