Index: TECH/Lock.cls.xml
===================================================================
diff -u -r918 -r977
--- TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 918)
+++ TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 977)
@@ -3,7 +3,7 @@
 <Class name="TECH.Lock">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Property name="LockKey">
 <Type>%String</Type>
@@ -26,35 +26,29 @@
 Lock(TimeOut [Default: 10], LockType [Default: Exclusive])
 Indien reeds een exclusieve lock geplaatst is, dan wordt een fout gethrowed.
 </Description>
-<FormalSpec>TimeOut:%Integer=10,LockType:TECH.enu.LockType="X"</FormalSpec>
+<FormalSpec>TimeOut:%Integer=10,LockType:TECH.enu.LockType=##class(TECH.enu.LockType).Exclusive()</FormalSpec>
 <Implementation><![CDATA[
-	#dim Status As %String = ..GeefStatus()
-	/// Als shared lock is opgezet, en nog een shared lock gevraagd wordt, dan lock raisen.
-	If ((Status = ##class(TECH.enu.LockType).Shared()) && (LockType = ##class(TECH.enu.LockType).Shared())){
-		LOCK +@(..LockKey)#"S"
-	}
-	/// Als shared lock is opgezet, en een exclusive lock gevraagd wordt : Fout
-	ElseIf ((Status = ##class(TECH.enu.LockType).Shared()) && (LockType = ##class(TECH.enu.LockType).Exclusive())){
-		Set Exception = ##class(TECH.Exceptions.LockedException).%New("Kan geen exclusieve lock verkrijgen voor "_..LockKey_", heeft reeds een shared lock")
-		Do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}
-	///  Als exclusive lock is opgezet : Fout
-	ElseIf(Status = ##class(TECH.enu.LockType).Exclusive()){
-		Set Exception = ##class(TECH.Exceptions.LockedException).%New("Kan geen "_LockType_" lock verkrijgen voor "_..LockKey_", heeft reeds een exclusive lock")
-		Do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}
-	/// Geen lock opgezet : Lock opzetten
-	ElseIf(Status = ""){
-		If (LockType = ##class(TECH.enu.LockType).Shared()){
-			LOCK +@(..LockKey)#"S"
-		}ElseIf(LockType = ##class(TECH.enu.LockType).Exclusive()){
-			LOCK +@(..LockKey)	
+	If ..HeeftSharedLock() {
+		If '..KanLockOpSharedLock(LockType) {
+			#dim LockTypeDisplay As %String = ##class(TECH.enu.LockType).LogicalToDisplay(LockType)
+			Set Exception = ##class(TECH.Exceptions.LockedException).%New("Proces "_$Job_" kan geen "_LockTypeDisplay_" lock verkrijgen voor "_..LockKey_", Proces"_..GeefOwner()_" heeft reeds een shared lock")
+			Do ##class(TECH.ExceptionHandler).Throw(Exception)
+		} Else {
+			Do ..VoegToeLock(LockType)
 		}
-	}
-	/// Toch lock opgezet, maar van onbekend type : Fout
-	Else{			
-		Set Status = ..GeefStatus()
-		Set Exception = ##class(TECH.Exceptions.LockedException).%New("Kan geen "_LockType_" lock verkrijgen voor "_..LockKey_", status : '"_$$LCVT^vhLib(Status)_"'")
+	} ElseIf ..HeeftExclusiveLock() {
+		If '..KanLockOpExclusiveLock() {
+			Set LockTypeDisplay = ##class(TECH.enu.LockType).LogicalToDisplay(LockType)
+			Set Exception = ##class(TECH.Exceptions.LockedException).%New("Proces "_$Job_" kan geen "_LockTypeDisplay_" lock verkrijgen voor "_..LockKey_", Proces"_..GeefOwner()_" heeft reeds een exclusive lock")
+			Do ##class(TECH.ExceptionHandler).Throw(Exception)
+		} Else {
+			Do ..VoegToeLock(LockType)
+		}
+	} ElseIf '..HeeftLock() {
+		Do ..VoegToeLock(LockType)
+	} Else {
+		Set LockTypeDisplay = ##class(TECH.enu.LockType).LogicalToDisplay(LockType)
+		Set Exception = ##class(TECH.Exceptions.LockedException).%New("Proces "_$Job_" kan geen "_LockTypeDisplay_" lock verkrijgen voor "_..LockKey_", status : '"_$$LCVT^vhLib(..GeefStatus())_"'")
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 ]]></Implementation>
@@ -78,6 +72,43 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeLock">
+<FormalSpec>LockType:TECH.enu.LockType</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If LockType = ##class(TECH.enu.LockType).Shared() {
+		LOCK +@(..LockKey)#"S"
+	} ElseIf LockType = ##class(TECH.enu.LockType).Exclusive(){
+		LOCK +@(..LockKey)	
+	}
+]]></Implementation>
+</Method>
+
+<Method name="KanLockOpSharedLock">
+<FormalSpec>LockType:TECH.enu.LockType</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim KanLocken As %Boolean = $$$False
+	If ..HeeftSharedLock() && ((LockType = ##class(TECH.enu.LockType).Exclusive()) && ..IsAlleenOwner()) || (LockType = ##class(TECH.enu.LockType).Shared()) {
+		Set KanLocken = $$$True
+	}
+	Quit KanLocken
+]]></Implementation>
+</Method>
+
+<Method name="KanLockOpExclusiveLock">
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim KanLocken As %Boolean = $$$False
+	If ..HeeftExclusiveLock() && ..IsAlleenOwner(){
+		Set KanLocken = $$$True
+	}
+	Quit KanLocken
+]]></Implementation>
+</Method>
+
 <Method name="GeefStatus">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
@@ -86,37 +117,42 @@
 </Method>
 
 <Method name="HeeftLock">
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit (..GeefStatus() '= "")
 ]]></Implementation>
 </Method>
 
-<Method name="IsGelocked">
+<Method name="HeeftExclusiveLock">
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ^$LOCK(..LockKey,"OWNER")'=$job
+<Implementation><![CDATA[	Quit (^$LOCK(..LockKey,"MODE") = ##class(TECH.enu.LockType).Exclusive())
 ]]></Implementation>
 </Method>
 
-<Method name="HeeftExclusiveLock">
+<Method name="HeeftSharedLock">
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (..GeefStatus() = ##class(TECH.enu.LockType).Exclusive())
+<Implementation><![CDATA[	Quit (^$LOCK(..LockKey,"MODE") = ##class(TECH.enu.LockType).Shared())
 ]]></Implementation>
 </Method>
 
-<Method name="HeeftSharedLock">
+<Method name="IsAlleenOwner">
+<Private>1</Private>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit (..GeefStatus() = ##class(TECH.enu.LockType).Shared())
+<Implementation><![CDATA[
+	#dim IsAlleenOwner As %Boolean = $$$False
+	If ..GeefOwner() = $Job {
+		Set IsAlleenOwner = $$$True
+	}
+	Quit IsAlleenOwner
 ]]></Implementation>
 </Method>
 
-<Method name="%OnClose">
+<Method name="GeefOwner">
 <Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<ReturnType>%Status</ReturnType>
-<ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[
-	do ..UnLock()
-	Quit $$$OK
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ^$LOCK(..LockKey, "OWNER")
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/enu/LockType.cls.xml
===================================================================
diff -u -r9 -r977
--- TECH/enu/LockType.cls.xml	(.../LockType.cls.xml)	(revision 9)
+++ TECH/enu/LockType.cls.xml	(.../LockType.cls.xml)	(revision 977)
@@ -3,14 +3,14 @@
 <Class name="TECH.enu.LockType">
 <ClassType>datatype</ClassType>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%String</Super>
+<Super>TECH.Enumeration</Super>
 
 <Parameter name="VALUELIST">
 <Default>,S,X</Default>
 </Parameter>
 
 <Parameter name="DISPLAYLIST">
-<Default>;Shared;Exclusive</Default>
+<Default>,Shared,Exclusive</Default>
 </Parameter>
 
 <Method name="Shared">