Index: TECH/Concurrency/Transactie.cls.xml
===================================================================
diff -u -r9 -r553
--- TECH/Concurrency/Transactie.cls.xml	(.../Transactie.cls.xml)	(revision 9)
+++ TECH/Concurrency/Transactie.cls.xml	(.../Transactie.cls.xml)	(revision 553)
@@ -16,25 +16,23 @@
 <Super>%RegisteredObject</Super>
 
 <Property name="Status">
-<Description>
-TODO: Indien niet Gestart, dan geen locks uitvoeren.</Description>
-<Type>TxStatus</Type>
+<Type>TECH.Concurrency.TxStatus</Type>
 <Private>1</Private>
 </Property>
 
 <Property name="Locks">
-<Type>ObjectLock</Type>
+<Type>TECH.Concurrency.ObjectLock</Type>
 <Collection>array</Collection>
 <Private>1</Private>
 </Property>
 
 <Property name="IsolatieLevel">
-<Type>TxIsolatieLevel</Type>
+<Type>TECH.Concurrency.TxIsolatieLevel</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>IsolatieLevel:TxIsolatieLevel=""</FormalSpec>
+<FormalSpec>IsolatieLevel:TECH.Concurrency.TxIsolatieLevel=""</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	If ("" = $Get(IsolatieLevel)) {
@@ -47,13 +45,13 @@
 </Method>
 
 <Method name="GeefIsolatieLevel">
-<ReturnType>TxIsolatieLevel</ReturnType>
+<ReturnType>TECH.Concurrency.TxIsolatieLevel</ReturnType>
 <Implementation><![CDATA[	Quit ..IsolatieLevel
 ]]></Implementation>
 </Method>
 
 <Method name="GeefStatus">
-<ReturnType>TxStatus</ReturnType>
+<ReturnType>TECH.Concurrency.TxStatus</ReturnType>
 <Implementation><![CDATA[	Quit ..Status
 ]]></Implementation>
 </Method>
@@ -100,13 +98,18 @@
 
 <Method name="Start">
 <Implementation><![CDATA[
+	If ..Status '= ##class(TECH.Concurrency.TxStatus).NietGestart() {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New( "De Transactie is niet in status 'gestart', maar '" _ ..Status _ "'." ))
+	}
+	
 	TSTART
 	Set ..Status = ##class(TxStatus).Gestart()
 ]]></Implementation>
 </Method>
 
 <Method name="Commit">
 <Implementation><![CDATA[
+	Do ..CheckStatusGestart()
 	
 	TCOMMIT
 	Do ..ReleaseLocks()
@@ -116,6 +119,7 @@
 
 <Method name="Rollback">
 <Implementation><![CDATA[
+	Do ..CheckStatusGestart()
 	TROLLBACK
 	Do ..ReleaseLocks()
 	Set ..Status = ##class(TxStatus).RolledBack()
@@ -145,10 +149,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="CheckStatusGestart">
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ..Status '= ##class(TECH.Concurrency.TxStatus).Gestart() {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New( "De Transactie is niet in status 'gestart', maar '" _ ..Status _ "'." ))
+	}
+]]></Implementation>
+</Method>
+
 <Method name="Lock">
 <FormalSpec>Object:%Persistent,Shared:%Boolean</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	Do ..CheckStatusGestart()
+	
 	Set ObjectLock = ..MaakLockObject(Object, Shared)
 	If ('..ObjectLockBestaat(ObjectLock)) {
 		Do ..RegistreerObjectLock(ObjectLock)
@@ -159,7 +174,7 @@
 </Method>
 
 <Method name="ReleaseLock">
-<FormalSpec>ObjectLock:ObjectLock</FormalSpec>
+<FormalSpec>ObjectLock:TECH.Concurrency.ObjectLock</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
 		Set StatusCode = $classmethod(ObjectLock.KlasseNaam, "%UnlockId", ObjectLock.ObjectId, ObjectLock.Shared)
@@ -168,16 +183,18 @@
 </Method>
 
 <Method name="ObjectLockBestaat">
-<FormalSpec>ObjectLock:ObjectLock</FormalSpec>
+<FormalSpec>ObjectLock:TECH.Concurrency.ObjectLock</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[		Quit (..Locks.IsDefined(ObjectLock.GeefAlsKey()))
 ]]></Implementation>
 </Method>
 
 <Method name="RegistreerObjectLock">
-<FormalSpec>ObjectLock:ObjectLock</FormalSpec>
+<FormalSpec>ObjectLock:TECH.Concurrency.ObjectLock</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
+	Do ..CheckStatusGestart()
+	
 		Do ..Locks.SetAt(ObjectLock, ObjectLock.GeefAlsKey())
 		Do ..LogTrace("Lock gekregen : " _ ObjectLock.ToString())
 ]]></Implementation>
@@ -194,7 +211,7 @@
 </Method>
 
 <Method name="LogTrace">
-<FormalSpec>Bericht</FormalSpec>
+<FormalSpec>Bericht:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[	// Hier kan eventueel koppeling met een logging systeem.
 ]]></Implementation>
Index: TECH/Concurrency/TxScope.cls.xml
===================================================================
diff -u -r9 -r553
--- TECH/Concurrency/TxScope.cls.xml	(.../TxScope.cls.xml)	(revision 9)
+++ TECH/Concurrency/TxScope.cls.xml	(.../TxScope.cls.xml)	(revision 553)
@@ -145,6 +145,10 @@
 <FormalSpec>IsolatieLevel:TxIsolatieLevel=""</FormalSpec>
 <Implementation><![CDATA[
 	Do ..ControleerIsHuidigeScope()
+
+	If (..Status '= ##class(TxStatus).NietGestart()) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Deze TxScope is niet in status 'Niet gestart', maar in status '" _ ..Status _ "'."))
+	}
 	
 	If (##class(TxScopeOptie).Required() = ..ScopeOptie)
 	{
@@ -166,7 +170,7 @@
 
 <Method name="Commit">
 <Implementation><![CDATA[
-	Do ..ControleerIsHuidigeScope()
+	Do ..ControleerIsHuidigeGestarteScope()
 	
 	If (..TransactieGestartInDezeScope) {
 		Do ..Transactie.Commit()
@@ -179,9 +183,9 @@
 
 <Method name="Rollback">
 <Implementation><![CDATA[
-	Do ..ControleerIsHuidigeScope()
+	Do ..ControleerIsHuidigeGestarteScope()
 	
-	If ("" '= ..Transactie) {
+	If ( ("" '= ..Transactie) && (##class(TxStatus).RolledBack() '= ..Transactie.GeefStatus()) ){
 		Do ..Transactie.Rollback()
 	}
 	Set ..Status = ##class(TxStatus).RolledBack()
@@ -190,6 +194,15 @@
 ]]></Implementation>
 </Method>
 
+<Method name="ControleerIsHuidigeGestarteScope">
+<Implementation><![CDATA[
+	Do ..ControleerIsHuidigeScope()
+	If (..Status '= ##class(TxStatus).Gestart()) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Deze TxScope is niet in status 'Gestart', maar in status '" _ ..Status _ "'."))
+	}
+]]></Implementation>
+</Method>
+
 <Method name="ControleerIsHuidigeScope">
 <Implementation><![CDATA[
 	If (..GeefHuidigeOfNiets() '= $this) {
@@ -201,7 +214,7 @@
 <Method name="LockShared">
 <FormalSpec>Object:%Persistent</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ControleerIsHuidigeScope()
+	Do ..ControleerIsHuidigeGestarteScope()
 	
 	Quit:(""=..Transactie)
 	Do ..Transactie.LockShared(Object)
@@ -211,7 +224,7 @@
 <Method name="LockExclusive">
 <FormalSpec>Object:%Persistent</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ControleerIsHuidigeScope()
+	Do ..ControleerIsHuidigeGestarteScope()
 	
 	Quit:(""=..Transactie)
 	Do ..Transactie.LockExclusive(Object)
@@ -221,7 +234,7 @@
 <Method name="RegistreerSharedLock">
 <FormalSpec>Object:%Persistent</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ControleerIsHuidigeScope()
+	Do ..ControleerIsHuidigeGestarteScope()
 	
 	Quit:(""=..Transactie)
 	Do ..Transactie.RegistreerSharedLock(Object)
@@ -231,7 +244,7 @@
 <Method name="RegistreerExclusiveLock">
 <FormalSpec>Object:%Persistent</FormalSpec>
 <Implementation><![CDATA[
-	Do ..ControleerIsHuidigeScope()
+	Do ..ControleerIsHuidigeGestarteScope()
 	
 	Quit:(""=..Transactie)
 	Do ..Transactie.RegistreerExclusiveLock(Object)