Index: TECH/Lock/MultiGlobalLocker.cls.xml
===================================================================
diff -u -r3329 -r3358
--- TECH/Lock/MultiGlobalLocker.cls.xml	(.../MultiGlobalLocker.cls.xml)	(revision 3329)
+++ TECH/Lock/MultiGlobalLocker.cls.xml	(.../MultiGlobalLocker.cls.xml)	(revision 3358)
@@ -73,16 +73,22 @@
 <Implementation><![CDATA[
 	#Dim GlobalRefIterator as TECH.ListIterator = ##class(TECH.ListIterator).%New(##class(TECH.ListUtils).RemoveDuplicateItems(..GlobalRefs))
 	#Dim GlobalRef as %String
-	
-	#Dim LockCmd as String = "Lock "_Operation_"("
-	while GlobalRefIterator.HasNext(){
-		set GlobalRef = GlobalRefIterator.Next()
-		set LockCmd = LockCmd _ GlobalRef
-		set:(GlobalRefIterator.HasNext()) LockCmd = LockCmd _ ","
+	#dim LockOK as %Boolean = $$$True
+	while (GlobalRefIterator.HasNext() && LockOK){
+		#Dim LockCmd as String = "Lock "_Operation_"("
+		while( GlobalRefIterator.HasNext() && ( $Length(LockCmd) < 1000)) {
+			set GlobalRef = GlobalRefIterator.Next()
+			set LockCmd = LockCmd _ GlobalRef
+			set:(GlobalRefIterator.HasNext()  && ( $Length(LockCmd) < 1000) ) LockCmd = LockCmd _ ","
+		}
+		set LockCmd = LockCmd _ "):"_timeout 
+		xecute LockCmd
+		Set LockOK = LockOK && $TEST
+		If ($$$Not(LockOK)  && (Operation = "+")) {
+			Do ..LockGlobals("-",0)
+		}
 	}
-	set LockCmd = LockCmd _ "):"_timeout 
-	xecute LockCmd
-	quit $TEST
+	quit LockOK
 ]]></Implementation>
 </Method>
 </Class>