Merge pull request #100 from pdebruic/gs_master

dalehenrich · web-flow · commit f784fc4fea8b · 2022-06-29T08:48:32.000-07:00
changes to be able to use streaming with seaside
diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServerManagingMultiThreadedServer.class/instance/writeResponse.on..st b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServerManagingMultiThreadedServer.class/instance/writeResponse.on..st
@@ -2,6 +2,8 @@ request handling
 writeResponse: response on: streamTransientStackValue
   "Write response to stream and flush the stream"
 
-  response writeOn: streamTransientStackValue value.
+  response isStreamingResponse
+    ifTrue: [ self write: response duringTransactionOn: streamTransientStackValue value ]
+    ifFalse: [ response writeOn: streamTransientStackValue value ].
   streamTransientStackValue value flush.
   self logResponse: response
diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServerManagingMultiThreadedServer.class/methodProperties.json b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServerManagingMultiThreadedServer.class/methodProperties.json
@@ -25,6 +25,6 @@
 		"socketStreamOn:" : "dkh 01/07/2015 16:40",
 		"start" : "dkh 01/07/2015 17:46",
 		"stop:" : "dkh 01/07/2015 17:49",
-		"writeResponse:on:" : "dkh 01/07/2015 16:40",
+		"writeResponse:on:" : "PaulDeBruicker 06/28/2022 14:26",
 		"writeResponseBad:on:" : "dkh 01/08/2015 17:03",
 		"writeResponseSafely:on:" : "dkh 01/07/2015 18:29" } }
diff --git a/repository/Zinc-GemStone-Server-Tools.package/monticello.meta/version b/repository/Zinc-GemStone-Server-Tools.package/monticello.meta/version
diff --git a/repository/Zinc-HTTP.package/Object.extension/instance/isStreamingResponse.st b/repository/Zinc-HTTP.package/Object.extension/instance/isStreamingResponse.st
@@ -0,0 +1,3 @@
+*zinc-http
+isStreamingResponse
+  ^ false
diff --git a/repository/Zinc-HTTP.package/Object.extension/methodProperties.json b/repository/Zinc-HTTP.package/Object.extension/methodProperties.json
@@ -2,4 +2,5 @@
 	"class" : {
 		 },
 	"instance" : {
-		"deprecated:on:in:" : "SvenVanCaekenberghe 07/20/2012 01:11:50" } }
+		"deprecated:on:in:" : "SvenVanCaekenberghe 07/20/2012 01:11:50",
+		"isStreamingResponse" : "PaulDeBruicker 06/24/2022 16:43" } }
diff --git a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/write.duringTransactionOn..st b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/write.duringTransactionOn..st
@@ -0,0 +1,16 @@
+request handling
+write: response duringTransactionOn: stream
+  | commitResult |
+  System inTransaction
+    ifTrue: [ 
+      "We already are in a transaction, so just write the response"
+      response writeOn: stream.
+      ^ true ]
+    ifFalse: [ 
+      [ 
+      System beginTransaction.
+      response writeOn: stream ]
+        ensure: [ 
+          "workaround for Bug 42963: ensure: block executed twice (don't return from ensure: block)"
+          commitResult := System commitTransaction ] ].
+  ^ commitResult
diff --git a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/writeResponse.on..st b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/instance/writeResponse.on..st
@@ -1,7 +1,9 @@
 request handling
 writeResponse: response on: stream
-	"Write response to stream and flush the stream"
-	
-	response writeOn: stream.
-	stream flush.
-	self logResponse: response
+  "Write response to stream and flush the stream"
+
+  response isStreamingResponse
+    ifTrue: [ self write: response duringTransactionOn: stream ]
+    ifFalse: [ response writeOn: stream ].
+  stream flush.
+  self logResponse: response
diff --git a/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/methodProperties.json b/repository/Zinc-HTTP.package/ZnSingleThreadedServer.class/methodProperties.json
@@ -46,4 +46,5 @@
 		"stop:" : "dkh 12/06/2014 15:00",
 		"stopLogging" : "SvenVanCaekenberghe 10/4/2011 12:35",
 		"withMaximumEntitySizeDo:" : "SvenVanCaekenberghe 9/5/2012 12:49",
-		"writeResponse:on:" : "SvenVanCaekenberghe 12/14/2010 14:37" } }
+		"write:duringTransactionOn:" : "PaulDeBruicker 06/28/2022 14:25",
+		"writeResponse:on:" : "PaulDeBruicker 06/28/2022 14:22" } }
diff --git a/repository/Zinc-HTTP.package/ZnTransactionSafeManagingMultiThreadedServer.class/instance/writeResponse.on..st b/repository/Zinc-HTTP.package/ZnTransactionSafeManagingMultiThreadedServer.class/instance/writeResponse.on..st
@@ -2,6 +2,10 @@ request handling
 writeResponse: response on: streamTransientStackValue
   "Write response to stream and flush the stream"
 
-  response writeOn: streamTransientStackValue value.
+  response isStreamingResponse
+    ifTrue: [ 
+      GRPlatform current
+        doTransaction: [ response writeOn: streamTransientStackValue value ] ]
+    ifFalse: [ response writeOn: streamTransientStackValue value ].
   streamTransientStackValue value flush.
   self logResponse: response
diff --git a/repository/Zinc-HTTP.package/ZnTransactionSafeManagingMultiThreadedServer.class/methodProperties.json b/repository/Zinc-HTTP.package/ZnTransactionSafeManagingMultiThreadedServer.class/methodProperties.json
@@ -17,5 +17,5 @@
 		"serverSocket" : "dkh 12/08/2014 15:51",
 		"socketStreamOn:" : "dkh 12/08/2014 15:21",
 		"stop:" : "dkh 12/08/2014 15:21",
-		"writeResponse:on:" : "dkh 12/08/2014 16:01",
+		"writeResponse:on:" : "PaulDeBruicker 06/24/2022 16:25",
 		"writeResponseSafely:on:" : "dkh 12/08/2014 15:58" } }
diff --git a/repository/Zinc-HTTP.package/monticello.meta/version b/repository/Zinc-HTTP.package/monticello.meta/version
diff --git a/workspace.md b/workspace.md
@@ -14,6 +14,7 @@ Metacello image
 	baseline: #('ZincHTTPComponents');
 	silently;
 	get.
+
 Metacello image
 	baseline: #('ZincHTTPComponents');
 	silently;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+*zinc-http`
	`2`	`+isStreamingResponse`
	`3`	`+ ^ false`