Index: vhUnitTest/APPS/HR/ProTime/Facade.cls.xml
===================================================================
diff -u -r1742 -r2192
--- vhUnitTest/APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 1742)
+++ vhUnitTest/APPS/HR/ProTime/Facade.cls.xml	(.../Facade.cls.xml)	(revision 2192)
@@ -26,7 +26,6 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set $ZTRAP = "Catch"
-	
 	TSTART
 	
 	Do ..Synchroniseer()
Index: TECH/File/FileReader.cls.xml
===================================================================
diff -u -r2184 -r2192
--- TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2184)
+++ TECH/File/FileReader.cls.xml	(.../FileReader.cls.xml)	(revision 2192)
@@ -6,20 +6,13 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Bestand">
-<Description>
-wat met locking ??? wat als iemand bezig is met het bestand te wijzigen ???</Description>
 <Type>%String</Type>
+<Private>1</Private>
 </Property>
 
-<UDLText name="T">
-<Content><![CDATA[
-// (RV-JCL) private ??
-
-]]></Content>
-</UDLText>
-
 <Property name="FileCharacterStream">
 <Type>%FileCharacterStream</Type>
+<Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
@@ -54,20 +47,27 @@
 <Method name="ReadLine">
 <Description>
 Leest een lijn uit. 
-Resultaat -1 = einde van bestand.
-
-(RV-JCL) zou AtEnd in aparte waarde steken .. wat als de tekst juist -1 is ;-)
-wat met rewind ??? of iedere keer file reader opnieuw openen..</Description>
+Resultaat -1 = einde van bestand.</Description>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set Line = -1
+	Set Line = ""
 	If ('..FileCharacterStream.AtEnd){
 		Set Line = ..FileCharacterStream.ReadLine()
 	}
+	If (Line = "") { 
+		Set Exception = ##class(TECH.Exceptions.FileException).%New("Einde van bestand  '"_..Bestand_"' reeds bereikt.")
+		Do ##class(TECH.ExceptionHandler).Throw(Exception) 
+	}
 	Quit Line
 ]]></Implementation>
 </Method>
 
+<Method name="HasNextLine">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit '..AtEnd()
+]]></Implementation>
+</Method>
+
 <Method name="AtEnd">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit ..FileCharacterStream.AtEnd
@@ -81,7 +81,9 @@
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Do ..Close()
+<Implementation><![CDATA[
+	Do ..Close()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml
===================================================================
diff -u -r1174 -r2192
--- vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml	(.../TestKlantBestand.cls.xml)	(revision 1174)
+++ vhUnitTest/APPS/CRM/TestKlantBestand.cls.xml	(.../TestKlantBestand.cls.xml)	(revision 2192)
@@ -3,7 +3,7 @@
 <Class name="vhUnitTest.APPS.CRM.TestKlantBestand">
 <Description>
 JBL + 2011-05-19
- Do ##class(vhUnitTest.Manager).RunTest("/Display=all","APPS.CRM.TestKlantBestand")</Description>
+Do ##class(vhUnitTest.Manager).RunTest("/Display=all","APPS.CRM.TestKlantBestand")</Description>
 <ProcedureBlock>1</ProcedureBlock>
 <Super>vhUnitTest.TestCase</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
Index: TECH/File/FileWriter.cls.xml
===================================================================
diff -u -r2184 -r2192
--- TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2184)
+++ TECH/File/FileWriter.cls.xml	(.../FileWriter.cls.xml)	(revision 2192)
@@ -15,14 +15,12 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Lock">
+<Property name="LockHelper">
 <Type>TECH.Lock</Type>
 <Private>1</Private>
 </Property>
 
 <Property name="WriteImmediate">
-<Description>
-Lock vervangen door LockTool of LockHelper</Description>
 <Type>%Boolean</Type>
 <Private>1</Private>
 </Property>
@@ -40,9 +38,9 @@
 	Set ..WriteImmediate = WriteImmediate
 	
 	/// Nagaan of reeds naar bestand wordt geschreven door ander process
-	Set ..Lock = ##class(TECH.Lock).%New(..GeefLockKey())
-	If ('..Lock.HeeftLock()) {
-		Do ..Lock.Lock(##class(TECH.enu.LockType).Exclusive())
+	Set ..LockHelper = ##class(TECH.Lock).%New(..GeefLockKey())
+	If ('..LockHelper.IsGelocked()) {
+		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)
 		Do ##class(TECH.ExceptionHandler).Throw(Exception)
@@ -60,7 +58,7 @@
 		Set ..FileCharacterStream.Filename = ..Bestand
 	}Else{
 		Set TempDir = ##class(TECH.Config.ConfigMgr).Instance().GetString("vhDev.TempFilePath")	
-		Set TempFile = $job_"_"_##class(TECH.DateTime).CurrentTime()_"_"_$random(99999999)  // (RV-JCL) misschien vaste extensie gebruiken..
+		Set TempFile = $job_"_"_##class(TECH.DateTime).CurrentTime()_"_"_$random(99999999)_".tmp"
 		Set TempBestand = ##class(TECH.Files).AppendFile(TempDir,TempFile)
 		Set ..FileCharacterStream.Filename = TempBestand
 	}
@@ -87,16 +85,15 @@
 				Do ##class(TECH.ExceptionHandler).Throw(Exception)	
 			}			
 		}Else{
-			Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden verplaatst. '"_Filename_"' naar '"_..Bestand_"'.",0)
+			Set DeleteGelukt = ##class(TECH.File).Delete(Filename)
+			Set Exception = ##class(TECH.Exceptions.FileException).%New("Bestand kon niet worden verplaatst. '"_Filename_"' naar '"_..Bestand_"'. "_Filename_" is verwijderd ? "_DeleteGelukt_".",0)			
 			Do ##class(TECH.ExceptionHandler).Throw(Exception)
-			
-			/// (RV-JCL) hier toch delete herhalen van het temp bestand 
 		}
 	}		
 	Set ..FileCharacterStream = ""
 Catch	
 	Set $ZTRAP = ""
-	Do ..Lock.UnLock(##class(TECH.enu.LockType).Exclusive())
+	Do ..LockHelper.UnLock(##class(TECH.enu.LockType).Exclusive())
 ]]></Implementation>
 </Method>
 
@@ -129,7 +126,7 @@
 <Method name="GeefLockKey">
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit "^FileHandler("""_..Bestand_""")"  	// (RV-JCL) TECH.File.FileHandler
+<Implementation><![CDATA[	Quit "^TECH.File.FileHandler("""_..Bestand_""")"
 ]]></Implementation>
 </Method>
 
Index: TECH/Lock.cls.xml
===================================================================
diff -u -r2184 -r2192
--- TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 2184)
+++ TECH/Lock.cls.xml	(.../Lock.cls.xml)	(revision 2192)
@@ -27,31 +27,14 @@
 </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())){
+	If (LockType = ##class(TECH.enu.LockType).Shared()){
 		LOCK +@(..LockKey)#"S"
+	}ElseIf(LockType = ##class(TECH.enu.LockType).Exclusive()){
+		LOCK +@(..LockKey)
 	}
-	/// 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)	// (RV-JCL) alle andere locks worden te niet gedaan ... dus best lock + van maken..
-		}
-	}
 	/// 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)
 	}
@@ -88,6 +71,12 @@
 ]]></Implementation>
 </Method>
 
+<Method name="IsGelocked">
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $$IsLocked^vhLib(..LockKey)
+]]></Implementation>
+</Method>
+
 <Method name="HeeftExclusiveLock">
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[	Quit (..GeefStatus() = ##class(TECH.enu.LockType).Exclusive())