Index: vhUnitTest/TECH/Concurrency/impl/Klasse2.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Concurrency/impl/Klasse2.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Concurrency/impl/Klasse2.cls.xml	(revision 2442)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Concurrency.impl.Klasse2">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Concurrency.VhPersistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Naam">
+<Type>%String</Type>
+</Property>
+
+<Property name="Klasse1">
+<Type>vhUnitTest.TECH.Concurrency.impl.Klasse1</Type>
+</Property>
+
+<Property name="Klasse3">
+<Type>vhUnitTest.TECH.Concurrency.impl.Klasse3</Type>
+</Property>
+
+<Property name="ParentKlasse1">
+<Type>vhUnitTest.TECH.Concurrency.impl.Klasse1</Type>
+</Property>
+
+<Property name="Iets">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnDefineDependentConcurrency">
+<Implementation><![CDATA[
+	Do ..MarkDependentConcurrency(..Klasse1)
+	Set ..ParentKlasse1.Iets = "trallala"
+	Do ..MarkDependentConcurrency(..ParentKlasse1)
+]]></Implementation>
+</Method>
+
+<Method name="ToString">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..%ClassName()_": "_..Naam
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^zTryout.CSC.Klasse2D</DataLocation>
+<DefaultData>Klasse2DefaultData</DefaultData>
+<IdLocation>^zTryout.CSC.Klasse2D</IdLocation>
+<IndexLocation>^zTryout.CSC.Klasse2I</IndexLocation>
+<StreamLocation>^zTryout.CSC.Klasse2S</StreamLocation>
+<Data name="Klasse2DefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Iets</Value>
+</Value>
+<Value name="3">
+<Value>InstanceVersion</Value>
+</Value>
+<Value name="4">
+<Value>Klasse1</Value>
+</Value>
+<Value name="5">
+<Value>Naam</Value>
+</Value>
+<Value name="6">
+<Value>ParentKlasse1</Value>
+</Value>
+<Value name="7">
+<Value>Klasse3</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: TECH/Concurrency/VhPersistent.cls.xml
===================================================================
diff -u -r1747 -r2442
--- TECH/Concurrency/VhPersistent.cls.xml	(.../VhPersistent.cls.xml)	(revision 1747)
+++ TECH/Concurrency/VhPersistent.cls.xml	(.../VhPersistent.cls.xml)	(revision 2442)
@@ -14,7 +14,7 @@
 <Abstract>1</Abstract>
 <IncludeCode>TECH.Error</IncludeCode>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%Persistent</Super>
+<Super>TECH.Concurrency.VhConcurrencyPart</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="InstanceVersion">
@@ -29,14 +29,15 @@
 	If (InstanceVersion '= -1){
 		Set ..InstanceVersion = InstanceVersion
 	}
+	Do ..OnDefineDependentConcurrency()
 	Quit ##class(DbUtils).Save(##this)
 ]]></Implementation>
 </Method>
 
 <Method name="OpenId">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ID:%String</FormalSpec>
-<ReturnType>%Persistent</ReturnType>
+<ReturnType>%ObjectHandle</ReturnType>
 <Implementation><![CDATA[	Quit ##class(DbUtils).OpenId(ID, ..%ClassName(1))
 ]]></Implementation>
 </Method>
@@ -68,7 +69,10 @@
 <FormalSpec>insert:%Boolean</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DbUtils).OnAfterSave(##this, insert)
+<Implementation><![CDATA[
+	Set Status = ##super(insert)
+	If ($$$ISOK(Status)) Set Status = ##class(DbUtils).OnAfterSave(##this, insert)
+	Quit Status
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/TECH/Concurrency/impl/Klasse1.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Concurrency/impl/Klasse1.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Concurrency/impl/Klasse1.cls.xml	(revision 2442)
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Concurrency.impl.Klasse1">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Concurrency.VhPersistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Naam">
+<Type>%String</Type>
+</Property>
+
+<Property name="Klasse2">
+<Type>vhUnitTest.TECH.Concurrency.impl.Klasse2</Type>
+</Property>
+
+<Property name="Iets">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="OnDefineDependentConcurrency">
+<Implementation><![CDATA[	Do ..MarkDependentConcurrency(..Klasse2)
+]]></Implementation>
+</Method>
+
+<Method name="ToString">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..%ClassName()_": "_..Naam
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^zTryout.CSC.Klasse1D</DataLocation>
+<DefaultData>Klasse1DefaultData</DefaultData>
+<IdLocation>^zTryout.CSC.Klasse1D</IdLocation>
+<IndexLocation>^zTryout.CSC.Klasse1I</IndexLocation>
+<StreamLocation>^zTryout.CSC.Klasse1S</StreamLocation>
+<Data name="Klasse1DefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>InstanceVersion</Value>
+</Value>
+<Value name="3">
+<Value>Klasse1</Value>
+</Value>
+<Value name="4">
+<Value>Klasse2</Value>
+</Value>
+<Value name="5">
+<Value>Iets</Value>
+</Value>
+<Value name="6">
+<Value>Naam</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>
Index: TECH/Persistent.cls.xml
===================================================================
diff -u -r2230 -r2442
--- TECH/Persistent.cls.xml	(.../Persistent.cls.xml)	(revision 2230)
+++ TECH/Persistent.cls.xml	(.../Persistent.cls.xml)	(revision 2442)
@@ -77,5 +77,13 @@
 	Quit $$$ERROR($$$GeneralError,##class(TECH.ExceptionHandler).Catch().GeefOmschrijving())
 ]]></Implementation>
 </Method>
+
+<Method name="%OnAfterSave">
+<FormalSpec>insert:%Boolean</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: TECH/Concurrency/VhConcurrencyPart.cls.xml
===================================================================
diff -u
--- TECH/Concurrency/VhConcurrencyPart.cls.xml	(revision 0)
+++ TECH/Concurrency/VhConcurrencyPart.cls.xml	(revision 2442)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="TECH.Concurrency.VhConcurrencyPart">
+<Abstract>1</Abstract>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Persistent</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="IsDependentGemarkeerd">
+<Type>%Boolean</Type>
+<InitialExpression>0</InitialExpression>
+<Transient>1</Transient>
+</Property>
+
+<Method name="Save">
+<Implementation><![CDATA[
+	Do:..%IsModified() ..OnDefineDependentConcurrency()
+	Do ##super()
+]]></Implementation>
+</Method>
+
+<Method name="OnDefineDependentConcurrency">
+<Implementation><![CDATA[	// Do ..MarkDependentConcurrency(Object)
+]]></Implementation>
+</Method>
+
+<Method name="MarkDependentConcurrency">
+<Final>1</Final>
+<FormalSpec>Object:TECH.Concurrency.VhPersistent</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ($IsObject(Object) && ('Object.IsDependentGemarkeerd))
+	{
+		Set Object.IsDependentGemarkeerd = 1
+		Do Object.%SetModified(1)
+		Do Object.OnDefineDependentConcurrency()
+	}
+]]></Implementation>
+</Method>
+
+<Method name="%OnAfterSave">
+<FormalSpec>insert:%Boolean</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..IsDependentGemarkeerd = 0
+	Quit ##super(insert)
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Concurrency/TestVhPersistent.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Concurrency/TestVhPersistent.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Concurrency/TestVhPersistent.cls.xml	(revision 2442)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Concurrency.TestVhPersistent">
+<Description>
+do ##class(vhUnitTest.Manager).RunTest("/debug/display=all","TECH.Concurrency.TestVhPersistent")</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestDependentConcurrency">
+<Implementation><![CDATA[
+	Set Klasse1 = ##class(vhUnitTest.TECH.Concurrency.impl.Klasse1).%New()
+	Set Klasse1.Naam = "Eerste klasse1"
+	Set Klasse1.Klasse2 = ##class(vhUnitTest.TECH.Concurrency.impl.Klasse2).%New()
+	Set Klasse1.Klasse2.ParentKlasse1 = Klasse1
+	Set Klasse1.Klasse2.Naam = "Eerste klasse2"
+	Set Klasse1.Klasse2.Klasse1 = ##class(vhUnitTest.TECH.Concurrency.impl.Klasse1).%New()
+	Set Klasse1.Klasse2.Klasse1.Naam = "Tweede klasse1"
+	Do Klasse1.Save()
+	
+	Do $$$AssertEquals(Klasse1.InstanceVersion,1,"InstanceVersion is geïnitialiseerd")
+	Do $$$AssertEquals(Klasse1.Klasse2.InstanceVersion,1,"InstanceVersion is geïnitialiseerd")
+	Do $$$AssertEquals(Klasse1.Klasse2.Klasse1.InstanceVersion,1,"InstanceVersion is geïnitialiseerd")
+	
+	Set Klasse1.Klasse2.Iets = "Tralala"
+	Do Klasse1.Klasse2.Save()
+	
+	Do $$$AssertEquals(Klasse1.InstanceVersion,2,"De instanceversion is verhoogd omdat deze klasse een dependent concurrency heeft op de gewijzigde klasse")
+	Do $$$AssertEquals(Klasse1.Klasse2.InstanceVersion,2,"De instanceversion is verhoogd omdat deze klasse een dependent concurrency heeft op de gewijzigde klasse")
+	Do $$$AssertEquals(Klasse1.Klasse2.Klasse1.InstanceVersion,2,"De instanceversion is verhoogd omdat het object is gewijzigd")
+	
+	Set Klasse1.Klasse2.Klasse3 = ##class(vhUnitTest.TECH.Concurrency.impl.Klasse3).%New()
+	Set Klasse1.Klasse2.Klasse3.Iets = "Tralala"
+	Set Klasse1.Klasse2.Klasse3.ParentKlasse2 = Klasse1.Klasse2
+	Do Klasse1.Klasse2.Klasse3.Save()
+	
+	Do $$$AssertEquals(Klasse1.InstanceVersion,3,"De instanceversion is verhoogd omdat deze klasse een dependent concurrency heeft op de gewijzigde klasse")
+	Do $$$AssertEquals(Klasse1.Klasse2.InstanceVersion,3,"De instanceversion is verhoogd omdat deze klasse een dependent concurrency heeft op de gewijzigde klasse")
+	Do $$$AssertEquals(Klasse1.Klasse2.Klasse1.InstanceVersion,3,"De instanceversion is verhoogd omdat deze klasse een dependent concurrency heeft op de gewijzigde klasse")
+	
+	Do ##class(vhUnitTest.TECH.Concurrency.impl.Klasse1).%KillExtent()
+	Do ##class(vhUnitTest.TECH.Concurrency.impl.Klasse2).%KillExtent()
+	Do ##class(vhUnitTest.TECH.Concurrency.impl.Klasse3).%KillExtent()
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhUnitTest/TECH/Concurrency/impl/Klasse3.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Concurrency/impl/Klasse3.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Concurrency/impl/Klasse3.cls.xml	(revision 2442)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Concurrency.impl.Klasse3">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Concurrency.VhConcurrencyPart</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Property name="Iets">
+<Type>%String</Type>
+</Property>
+
+<Property name="ParentKlasse2">
+<Type>vhUnitTest.TECH.Concurrency.impl.Klasse2</Type>
+</Property>
+
+<Method name="OnDefineDependentConcurrency">
+<Implementation><![CDATA[	Do ..MarkDependentConcurrency(..ParentKlasse2)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^vhUnitTest.TECH.ConC09.Klasse3D</DataLocation>
+<DefaultData>Klasse3DefaultData</DefaultData>
+<IdLocation>^vhUnitTest.TECH.ConC09.Klasse3D</IdLocation>
+<IndexLocation>^vhUnitTest.TECH.ConC09.Klasse3I</IndexLocation>
+<StreamLocation>^vhUnitTest.TECH.ConC09.Klasse3S</StreamLocation>
+<Data name="Klasse3DefaultData">
+<Structure>listnode</Structure>
+<Subscript/>
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Iets</Value>
+</Value>
+<Value name="3">
+<Value>ParentKlasse2</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+</Export>