Index: TECH/Lock.cls.xml
===================================================================
diff -u -r9 -r918
--- TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 9)
+++ TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 918)
@@ -28,7 +28,7 @@
 </Description>
 <FormalSpec>TimeOut:%Integer=10,LockType:TECH.enu.LockType="X"</FormalSpec>
 <Implementation><![CDATA[
-	Set Status = ..GeefStatus()
+	#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"
@@ -57,18 +57,6 @@
 		Set Exception = ##class(TECH.Exceptions.LockedException).%New("Kan geen "_LockType_" lock verkrijgen voor "_..LockKey_", status : '"_$$LCVT^vhLib(Status)_"'")
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
-	/*
-	If (LockType = ##class(TECH.enu.LockType).Shared()){
-		LOCK +@(..LockKey)#"S"
-	}ElseIf(LockType = ##class(TECH.enu.LockType).Exclusive()){
-		LOCK +@(..LockKey)
-	}
-	/// 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)_"'")
-		Do ##class(TECH.ExceptionHandler).Throw(Exception)
-	}*/
 ]]></Implementation>
 </Method>
 
@@ -78,13 +66,14 @@
 Indien LockType leeg is wordt het type opgevraagd en de unlock uitgevoerd.</Description>
 <FormalSpec>LockType:TECH.enu.LockType=""</FormalSpec>
 <Implementation><![CDATA[
-	
 	If (LockType = ##class(TECH.enu.LockType).Shared()){
 		LOCK -@(..LockKey)#"S"		
 	}ElseIf(LockType = ##class(TECH.enu.LockType).Exclusive()){
 		LOCK -@(..LockKey)
 	}Else{
-		LOCK -@(..LockKey)#..GeefStatus()
+		#dim Status As %String = ..GeefStatus()
+		if ( $length(Status) ) && ( Status'="X" ) { LOCK -@(..LockKey)#Status }
+		else { LOCK -@(..LockKey) }
 	}
 ]]></Implementation>
 </Method>
@@ -104,7 +93,7 @@
 
 <Method name="IsGelocked">
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $$IsLocked^vhLib(..LockKey)
+<Implementation><![CDATA[	Quit ^$LOCK(..LockKey,"OWNER")'=$job
 ]]></Implementation>
 </Method>
 
@@ -119,6 +108,17 @@
 <Implementation><![CDATA[	Quit (..GeefStatus() = ##class(TECH.enu.LockType).Shared())
 ]]></Implementation>
 </Method>
+
+<Method name="%OnClose">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	do ..UnLock()
+	Quit $$$OK
+]]></Implementation>
+</Method>
 </Class>