Issue #14: on further review the code was not retrying ... one chance…

… only and we're hung and fail after timeout
GsDevKit · Mar 23, 2015 · 630376f · 630376f
1 parent d3dc6a4
commit 630376f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/monticello/GsUpgrader-Core-dkh.48.mcz b/monticello/GsUpgrader-Core-dkh.48.mcz
diff --git a/...itory/GsUpgrader-Core.package/GsUpgrader.class/instance/patchForGsDevKitIssue60Source1.st b/...itory/GsUpgrader-Core.package/GsUpgrader.class/instance/patchForGsDevKitIssue60Source1.st
@@ -30,7 +30,7 @@ patchForGsDevKitIssue60Source1
   response position < buf size & (self isActive | self readyForRead)
     & ((tries := tries - 1) >= 0) ]
     whileTrue: [ 
-      (self waitForReadDataUpToMs: 20000)
+      ((self waitForReadDataUpToMs: 2000) and: [tries < 0])
         ifFalse: [ self error: ''data was late'' ].
       bytesRead := self readInto: buf startingAt: 1 for: buf size.
       response nextPutAll: (buf copyFrom: 1 to: bytesRead) ].

diff --git a/...itory/GsUpgrader-Core.package/GsUpgrader.class/instance/patchForGsDevKitIssue60Source2.st b/...itory/GsUpgrader-Core.package/GsUpgrader.class/instance/patchForGsDevKitIssue60Source2.st
@@ -41,7 +41,7 @@ patchForGsDevKitIssue60Source2
   response position < buf size & (self isActive | self readyForRead)
     & ((tries := tries - 1) >= 0) ]
     whileTrue: [ 
-      (self waitForReadDataUpToMs: 20000)
+      ((self waitForReadDataUpToMs: 2000) and: [tries < 0])
         ifFalse: [ self error: ''data was late'' ].
       bytesRead _ self readInto: buf startingAt: 1 for: buf size.
       response nextPutAll: (buf copyFrom: 1 to: bytesRead) ].

diff --git a/repository/GsUpgrader-Core.package/GsUpgrader.class/methodProperties.json b/repository/GsUpgrader-Core.package/GsUpgrader.class/methodProperties.json
@@ -40,8 +40,8 @@
 		"notify:" : "dkh 09/05/2014 16:56",
 		"packageReportOn:" : "dkh 09/15/2014 13:48",
 		"patchForGsDevKitIssue60" : "dkh 03/23/2015 10:59",
-		"patchForGsDevKitIssue60Source1" : "dkh 03/23/2015 13:23",
-		"patchForGsDevKitIssue60Source2" : "dkh 03/23/2015 13:19",
+		"patchForGsDevKitIssue60Source1" : "dkh 03/23/2015 13:29",
+		"patchForGsDevKitIssue60Source2" : "dkh 03/23/2015 13:30",
 		"projectReportOn:" : "dkh 09/11/2014 16:38",
 		"projectVersion:" : "dkh 09/15/2014 13:13",
 		"registrationFor:" : "dkh 11/16/2014 20:06",