Index: TECH/OBJ/Validator.cls.xml
===================================================================
diff -u -r1074 -r2217
--- TECH/OBJ/Validator.cls.xml	(.../Validator.cls.xml)	(revision 1074)
+++ TECH/OBJ/Validator.cls.xml	(.../Validator.cls.xml)	(revision 2217)
@@ -17,10 +17,7 @@
 	set lbClassAndMethod = ##class(TECH.ClassUtils).GetCallingMethod()
 	set ClassName = $listget(lbClassAndMethod,1)
 	set Method = $listget(lbClassAndMethod,2)
-	if '##class(TECH.ClassUtils).IsValidReturnTypeForMethod(.Value,ClassName,Method) {
-		Set Info = "ClassName: "_ClassName_$$$CRLF_"Method: "_Method
-		$$$ThrowError($$$errInvalidOutput,Info)
-	}	
+	Do ##class(TECH.ClassUtils).ValidateReturnTypeForMethod(.Value,ClassName,Method)	
 	quit
 ]]></Implementation>
 </Method>
Index: WS/Info/Agenda.cls.xml
===================================================================
diff -u -r2206 -r2217
--- WS/Info/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2206)
+++ WS/Info/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2217)
@@ -28,7 +28,6 @@
 <ReturnType>%Boolean</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	Do ##class(TECH.ClassUtils).ControleerParameters()
 	Set IsArbeidsdag = $$ISARBDAG^vhRtn2(Date)
 	Quit IsArbeidsdag
 ]]></Implementation>
Index: vhUnitTest/APPS/HR/ProTime/FacadeUpdate.cls.xml
===================================================================
diff -u -r1742 -r2217
--- vhUnitTest/APPS/HR/ProTime/FacadeUpdate.cls.xml	(.../FacadeUpdate.cls.xml)	(revision 1742)
+++ vhUnitTest/APPS/HR/ProTime/FacadeUpdate.cls.xml	(.../FacadeUpdate.cls.xml)	(revision 2217)
@@ -27,15 +27,11 @@
 <Implementation><![CDATA[
 	Set $ZTRAP = "Catch"
 	
-	TSTART
-	
 	Do ..Synchroniseer()
 	
-	TCOMMIT
 	Quit $$$OK
 	
 Catch Set $ZTRAP = ""
-	TROLLBACK	
 	w !,$C(9),"Wijzigingen NIET doorgevoerd omwille van fout."
 	w $ECODE,!
 	Quit 0
Index: vhUnitTest/APPS/HR/ProTime/Facade.cls.xml
===================================================================
diff -u -r2192 -r2217
--- vhUnitTest/APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 2192)
+++ vhUnitTest/APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 2217)
@@ -26,15 +26,11 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set $ZTRAP = "Catch"
-	TSTART
-	
 	Do ..Synchroniseer()
 	
-	TCOMMIT
 	Quit $$$OK
 	
 Catch Set $ZTRAP = ""
-	TROLLBACK	
 	w !,$C(9),"Wijzigingen NIET doorgevoerd omwille van fout."
 	w $ECODE,!
 	Quit 0
Index: APPS/HR/ProTime/Facade.cls.xml
===================================================================
diff -u -r1734 -r2217
--- APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 1734)
+++ APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 2217)
@@ -90,43 +90,23 @@
 
 Instellen mail adres waarnaar feedback wordt gestuurd.
 Do ##class(TECH.Config.ConfigMgr).Instance().SetString("APPS.HR.ProTime.FeedbackMailTo","jbl@vanhoecke.be")</Description>
-<FormalSpec>AutomatischDoorvoeren:%Boolean=1</FormalSpec>
+<FormalSpec>StuurMail:%Boolean=1</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set $ZTRAP = "Catch"
 	Set From = $$$SystemMail($$$Server_" - ProTime")
 	Set MailTo = $LB(##class(TECH.Config.ConfigMgr).Instance().GetString("APPS.HR.ProTime.FeedbackMailTo"))
-	
-	TSTART
-	
+		
 	Set Feedback = ..Synchroniseer()
-	
-	If ('AutomatischDoorvoeren){
-		Write Feedback,!
-		Write "Wenst u de wijzigingen doorvoeren (Y/N) ?"
-		Read Doorvoeren,!
-		If ((Doorvoeren = "Y") || (Doorvoeren = "y")){
-			TCOMMIT
-			w !,$C(9),"Wijzigingen doorgevoerd."
-		}Else{
-			TROLLBACK	
-			w !,$C(9),"Wijzigingen NIET doorgevoerd."
-		}
-	}Else{
-		TCOMMIT	
-		If Feedback '= "" {
-			 Do SendMiniMail^vhLib(From,MailTo,"ProTime synchronisatie ["_$$$Server_"]",Feedback,0) 
-		}
+	If ((Feedback '= "") && (StuurMail)) {
+		 Do SendMiniMail^vhLib(From,MailTo,"ProTime synchronisatie ["_$$$Server_"]",Feedback,0) 
 	}
 	Quit $$$OK
 	
 Catch Set $ZTRAP = ""
-	TROLLBACK	
 	Set Feedback = $C(9)_"Wijzigingen NIET doorgevoerd omwille van fout."_$C(13,10)
 	Set Feedback = Feedback_$ECODE
-	If 'AutomatischDoorvoeren {
-		Write Feedback	
-	}Else{
+	If StuurMail {
 		Do SendMiniMail^vhLib(From,MailTo,"ProTime synchronisatie ["_$$$Server_"]",Feedback,0) 
 	}
 	Quit 0
Index: vhUnitTest/TECH/ClassUtils.cls.xml
===================================================================
diff -u -r2141 -r2217
--- vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2141)
+++ vhUnitTest/TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2217)
@@ -49,36 +49,18 @@
 <Implementation><![CDATA[
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
 	
-	Set $ZTRAP = "Catch1"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
-Catch1 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van TECH.Integer is niet gelukt.","Foutmelding is correct.")
 	
-	Set $ZTRAP = "Catch2"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
-Catch2 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van TECH.Integer is niet gelukt.","Foutmelding is correct.")
-	
-	Set $ZTRAP = "Catch3"	
+
+
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("1-3","vhUnitTest.TECH.ClassUtilsChecks","IntegerCheck"))
-Catch3 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van TECH.Integer is niet gelukt.","Foutmelding is correct.")
-		
 			
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
 	
+	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
 	
 	
-	Set $ZTRAP = "Catch4"
-	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod("A","vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
-Catch4 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van %Library.Float is niet gelukt.","Foutmelding is correct.")
-	
-	
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(1.5,"vhUnitTest.TECH.ClassUtilsChecks","FloatCheck"))
 	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
@@ -89,19 +71,12 @@
 	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.ValueList=""
-	Set $ZTRAP = "Catch5"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 2")
-Catch5 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van vhUnitTest.TECH.ClassUtilsTestObject is niet gelukt.","Foutmelding is correct.")	
-	Set $ZTRAP = "Catch6"
+
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="InvalidValue"
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 3")
-Catch6 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validatie van  '%Dictionary.CompiledProperty' is niet correct.","Foutmelding is correct.")
 	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
@@ -114,16 +89,13 @@
 	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
 	do $$$AssertTrue(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 5")
 
-	Set $ZTRAP = "Catch7"
+	
 	set obj = ##class(vhUnitTest.TECH.ClassUtilsTestObject).%New()
 	set obj.Required="required"
 	set obj.ValueList="ValidValue"
 	do obj.Array.SetAt(15.5,"OnGeldigeIntegerWaarde")
 	do obj.Array.SetAt(15,"GeldigeIntegerWaarde")
 	do $$$AssertFalse(##class(TECH.ClassUtils).IsValidReturnTypeForMethod(obj,"vhUnitTest.TECH.ClassUtilsChecks","ObjectCheck"),"obj Test 6")
-Catch7 Set $ZTRAP = ""
-	Set Exception = ##class(TECH.ExceptionHandler).Catch()
-	do $$$AssertTrue(Exception.GeefOmschrijving()["Validate van vhUnitTest.TECH.ClassUtilsTestObject is niet gelukt.","Foutmelding is correct.")
 	
 	quit
 ]]></Implementation>
Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r2207 -r2217
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2207)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2217)
@@ -40,7 +40,7 @@
 				/// Deep validate 
 				Set HeeftDefaultArg = ($length(DefaultArg)>0)
 				If ('HeeftDefaultArg || (HeeftDefaultArg && HeeftParameterInhoud)){
-					Do ##class(TECH.ClassUtils).ValueIsValid(@ParameterName,Parameter.GeefType())
+					Do ##class(TECH.ClassUtils).ValidateValue(@ParameterName,Parameter.GeefType())
 				}
 				Set CurrentParameter = CurrentParameter + 1
 			}			
@@ -109,7 +109,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsValidParameterForMethod">
+<Method name="ValidateParameterForMethod">
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String,Parameter:%String]]></FormalSpec>
 <Implementation><![CDATA[
@@ -122,12 +122,25 @@
 <ClassMethod>1</ClassMethod>
 <FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String]]></FormalSpec>
 <Implementation><![CDATA[
+	Set $ZTRAP = "CatchIsNotValidReturnType"
+	Do ..ValidateReturnTypeForMethod(.Value,ClassName,Method)
+	Quit $$$OK
+CatchIsNotValidReturnType
+	Set $ZTRAP = ""
+	Quit 0
+]]></Implementation>
+</Method>
+
+<Method name="ValidateReturnTypeForMethod">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String,Method:%String]]></FormalSpec>
+<Implementation><![CDATA[
 	set Type = ..GetMethodReturnType(ClassName,Method)
-	Do ..ValueIsValid(.Value,Type)
+	Do ..ValidateValue(.Value,Type)
 ]]></Implementation>
 </Method>
 
-<Method name="ValueIsValid">
+<Method name="ValidateValue">
 <Description>
 Throwt foutmelding indien niet geldig. </Description>
 <ClassMethod>1</ClassMethod>
@@ -155,10 +168,24 @@
 		Set:(($G(%objlasterror)'="") && '(%objlasterror [ "ECODETRAP")) Message = Message_" "_$$ParseStatus^vhLib(%objlasterror)
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New(Message))	
 	}
-	quit
 ]]></Implementation>
 </Method>
 
+<Method name="ValueIsValid">
+<ClassMethod>1</ClassMethod>
+<FormalSpec><![CDATA[&Value:%CacheString,ClassName:%String]]></FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set $ZTRAP = "CatchValueNotValid"
+	Do ..ValidateValue(.Value,ClassName)
+	Quit $$$OK	
+CatchValueNotValid
+	Set $ZTRAP = ""
+	
+	Quit 0
+]]></Implementation>
+</Method>
+
 <Method name="PropertiesValid">
 <Description>
 Throwt foutmelding indien niet geldig. </Description>
Index: vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml
===================================================================
diff -u -r2192 -r2217
--- vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml	(.../TestKlantBestand.cls.xml)	(revision 2192)
+++ vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml	(.../TestKlantBestand.cls.xml)	(revision 2217)
@@ -13,7 +13,7 @@
 <Private>1</Private>
 </Property>
 
-<Method name="TestLeverancierUnitTest">
+<Method name="TestKlantUnitTest">
 <Implementation><![CDATA[
 	Set KlantService = ##class(APPS.CRM.KlantService).%New()
 	Set Klanten = KlantService.GeefKlantLijst()
Index: TECH/Lock.cls.xml
===================================================================
diff -u -r2192 -r2217
--- TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 2192)
+++ TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 2217)
@@ -27,6 +27,36 @@
 </Description>
 <FormalSpec>TimeOut:%Integer=10,LockType:TECH.enu.LockType="X"</FormalSpec>
 <Implementation><![CDATA[
+	Set Status = ..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)	
+		}
+	}
+	/// 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)
+	}
+	/*
 	If (LockType = ##class(TECH.enu.LockType).Shared()){
 		LOCK +@(..LockKey)#"S"
 	}ElseIf(LockType = ##class(TECH.enu.LockType).Exclusive()){
@@ -37,7 +67,7 @@
 		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>
 
Index: TECH/File/FileWriter.cls.xml
===================================================================
diff -u -r2192 -r2217
--- TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2192)
+++ TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2217)
@@ -39,7 +39,7 @@
 	
 	/// Nagaan of reeds naar bestand wordt geschreven door ander process
 	Set ..LockHelper = ##class(TECH.Lock).%New(..GeefLockKey())
-	If ('..LockHelper.IsGelocked()) {
+	If ('..LockHelper.HeeftLock()) {
 		Do ..LockHelper.Lock(##class(TECH.enu.LockType).Exclusive())
 	}Else{
 		Set Exception = ##class(TECH.Exceptions.FileException).%New("Er wordt reeds naar de file '"_..Bestand_"' geschreven.",1)