Skip to content

Commit d16405a

Browse files
dalehenrichdalehenrich
committed
Merge pull request #75 from GsDevKit/issue_74
fix for Issue #74
2 parents ad1c315 + 80745ae commit d16405a

File tree

128 files changed

+141
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+141
-191
lines changed

‎repository/SocketStream.package/GsSocket.extension/instance/accept..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ accept: aTimeoutInSeconds
1111
newsock := sock accept.
1212
msg := newsock read: 512."
1313

14-
^ self listen: nil acceptingWith: (self speciesForAccept basicNew) for: aTimeoutInSeconds
14+
^ self listen: nil acceptingWith: (self speciesForAccept basicNew) for: aTimeoutInSeconds

‎repository/SocketStream.package/GsSocket.extension/instance/isConnected.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ isConnected
66
Returns nil if an error occurs."
77

88
self isActive ifFalse: [ ^false ].
9-
^ self _zeroArgPrim: 13.
9+
^ self _zeroArgPrim: 13.

‎repository/SocketStream.package/GsSocket.extension/instance/listen.acceptingWith.for..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ res := true.
2626
(res == nil) ifFalse: [
2727
res := aSocket.
2828
].
29-
^res
29+
^res

‎repository/SocketStream.package/SocketStream.class/instance/debug.st

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ debug
2121
nextPutAll: 'InBuffer data size: ', data asString; cr;
2222
nextPutAll: 'In data (20):', (inBuffer copyFrom: lastRead + 1 to: lastRead + (data min: 20)); cr;
2323
nextPutAll: 'OutBuffer data size: ', (outNextToWrite - 1) asString; cr;
24-
nextPutAll: 'Out data (20):', (outBuffer copyFrom: 1 to: ((outNextToWrite - 1) min: 20)); cr]]
25-
24+
nextPutAll: 'Out data (20):', (outBuffer copyFrom: 1 to: ((outNextToWrite - 1) min: 20)); cr]]

‎repository/SocketStream.package/SocketStream.class/instance/moveInBufferDown.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ moveInBufferDown
99
distanceMoved := lastRead.
1010
lastRead := 0.
1111
inNextToWrite := sz + 1.
12-
^distanceMoved
12+
^distanceMoved

‎repository/SocketStream.package/SocketStream.class/instance/peekFor..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ peekFor: aCharacterOrByte
1313
nextObject = aCharacterOrByte ifTrue: [
1414
lastRead := lastRead + 1.
1515
^true].
16-
^false
16+
^false

‎repository/SocketStream.package/SocketStream.class/instance/socket..st

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
as yet unclassified
22
socket: aSocket
3-
socket := TransientStackValue value: aSocket
3+
self _setNoStubbing. "as long as I am in memory prevent stubbing of my instance variables ... I will stay in memory as long as I am referenced from stack.."
4+
socket := TransientStackValue value: aSocket "if I am committed, then do not persist aSocket"

‎repository/SocketStream.package/SocketStream.class/methodProperties.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"size" : "PaulDeBruicker 03/03/2011 13:26",
7979
"skip:" : "PaulDeBruicker 03/03/2011 13:27",
8080
"socket" : "dkh 12/08/2014 16:08",
81-
"socket:" : "dkh 12/09/2014 10:01",
81+
"socket:" : "dkh 04/03/2015 11:14",
8282
"space" : "PaulDeBruicker 03/03/2011 13:27",
8383
"streamBuffer:" : "PaulDeBruicker 03/03/2011 13:27",
8484
"timeout" : "PaulDeBruicker 03/12/2011 12:01",

‎repository/SocketStream.package/SocketStreamSocket.class/class/standardTimeout.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
as yet unclassified
22
standardTimeout
33

4-
^0
4+
^0

‎repository/SocketStream.package/SocketStreamSocket.class/instance/onNativeSocket.forDomain.type.protocol..st

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ onNativeSocket: aSocket forDomain: aCommunicationDomain type: aSocketType protoc
77
communicationDomain := aCommunicationDomain.
88
socketType := aSocketType.
99
protocolNumber := aProtocolNumber.
10-
underlyingSocket := TransientStackValue value: aSocket.
10+
self _setNoStubbing. "as long as I am in memory prevent stubbing of my instance variables ... I will stay in memory as long as I am referenced from stack.."
11+
underlyingSocket := TransientStackValue value: aSocket. "if I am committed, then do not persist aSocket"
1112
^ self

‎repository/SocketStream.package/SocketStreamSocket.class/instance/onNativeclientSocket.for..st

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ onNativeclientSocket: aNativeSocket for: aServerSocket
77
communicationDomain := aServerSocket communicationDomain.
88
socketType := aServerSocket socketType.
99
protocolNumber := aServerSocket protocolNumber.
10-
underlyingSocket := TransientStackValue value: aNativeSocket.
10+
self _setNoStubbing. "as long as I am in memory prevent stubbing of my instance variables ... I will stay in memory as long as I am referenced from stack.."
11+
underlyingSocket := TransientStackValue value: aNativeSocket. "if I am committed, then do not persist aNativeSocket"
1112
^ self

‎repository/SocketStream.package/SocketStreamSocket.class/instance/receiveDataInto.startingAt..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ receiveDataInto: aStringOrByteArray startingAt: aNumber
1414

1515
bytesRead := self readInto: aStringOrByteArray startingAt: aNumber for: b ].
1616

17-
^bytesRead
17+
^bytesRead

‎repository/SocketStream.package/SocketStreamSocket.class/instance/receiveDataSignallingClosedInto.startingAt..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ receiveDataSignallingClosedInto: aStringOrByteArray startingAt: aNumber
1111
whileTrue: [
1212
self waitForData.
1313
bytesRead := self readInto: aStringOrByteArray startingAt: aNumber for: (aStringOrByteArray size -aNumber +1) ].
14-
^bytesRead
14+
^bytesRead

‎repository/SocketStream.package/SocketStreamSocket.class/instance/receiveDataTimeout.into.startingAt..st

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ receiveDataTimeout: timeout into: aStringOrByteArray startingAt: aNumber
66
zero (indicating that there was no data available within the given timeout)."
77

88
self waitForDataFor: timeout ifClosed: [] ifTimedOut: [].
9-
^self readInto: aStringOrByteArray startingAt: aNumber for: (aStringOrByteArray size - aNumber +1)
10-
9+
^self readInto: aStringOrByteArray startingAt: aNumber for: (aStringOrByteArray size - aNumber +1)

‎repository/SocketStream.package/SocketStreamSocket.class/instance/waitForAcceptFor..st

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
as yet unclassified
22
waitForAcceptFor: timeout
33
"Wait and accept an incoming connection. Return nil if it falis"
4-
^self waitForConnectionFor: timeout ifTimedOut: [^ nil].
5-
6-
4+
^self waitForConnectionFor: timeout ifTimedOut: [^ nil].

‎repository/SocketStream.package/SocketStreamSocket.class/instance/waitForDataFor..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ waitForDataFor: timeout
66
^self
77
waitForDataFor: timeout
88
ifClosed: [ConnectionClosed signal: 'Connection closed while waiting for data.']
9-
ifTimedOut: [ConnectionTimedOut signal: 'Data receive timed out.']
9+
ifTimedOut: [ConnectionTimedOut signal: 'Data receive timed out.']

‎repository/SocketStream.package/SocketStreamSocket.class/instance/waitForDataIfClosed..st

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ waitForDataIfClosed: closedBlock
1111
ifTrue: [
1212
^self].
1313

14-
self underlyingSocket readWillNotBlockWithin: -1].
14+
self underlyingSocket readWillNotBlockWithin: -1].

‎repository/SocketStream.package/SocketStreamSocket.class/methodProperties.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"class" : {
33
"standardTimeout" : "PaulDeBruicker 04/12/2011 16:07" },
44
"instance" : {
5-
"accept" : "dkh 12/04/2014 14:57",
5+
"accept" : "dkh 12/06/2014 12:12",
66
"accept:" : "dkh 12/04/2014 07:49",
77
"dataAvailable" : "PaulDeBruicker 04/08/2011 08:10",
88
"destroy" : "PaulDeBruicker 04/08/2011 18:29",
@@ -11,8 +11,8 @@
1111
"listenOn:backlogSize:" : "PaulDeBruicker 04/07/2011 17:37",
1212
"listenOn:backlogSize:interface:" : "dkh 08/06/2012 14:53",
1313
"localPort" : "PaulDeBruicker 04/10/2011 10:17",
14-
"onNativeSocket:forDomain:type:protocol:" : "dkh 12/09/2014 10:01",
15-
"onNativeclientSocket:for:" : "dkh 12/09/2014 10:01",
14+
"onNativeSocket:forDomain:type:protocol:" : "dkh 04/03/2015 11:14",
15+
"onNativeclientSocket:for:" : "dkh 04/03/2015 11:14",
1616
"port" : "PaulDeBruicker 03/12/2011 11:08",
1717
"receiveAvailableDataInto:startingAt:" : "PaulDeBruicker 03/12/2011 11:09",
1818
"receiveDataInto:startingAt:" : "PaulDeBruicker 04/12/2011 15:53",

‎repository/SocketStream.package/SocketStreamTest.class/instance/setUp.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ setUp
1414
] ensure:[listener close].
1515

1616
clientStream := SocketStream on: clientSocket.
17-
serverStream := SocketStream on: serverSocket.
17+
serverStream := SocketStream on: serverSocket.

‎repository/SocketStream.package/SocketStreamTest.class/instance/testNextIntoClose.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ testNextIntoClose
55
clientStream nextPutAll:'A line of text'; flush.
66
[(Delay forMilliseconds: 100) wait.
77
clientStream close] fork.
8-
self assert: ((serverStream next: 100 into: (String new: 100) startingAt: 1) = 'A line of text')
8+
self assert: ((serverStream next: 100 into: (String new: 100) startingAt: 1) = 'A line of text')

‎repository/SocketStream.package/SocketStreamTest.class/instance/testNextIntoCloseNonSignaling.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ testNextIntoCloseNonSignaling
77
[(Delay forMilliseconds: 100) wait.
88
clientStream close] fork.
99
self assert: ((serverStream next: 100 into: (String new: 100) startingAt: 1)
10-
= 'A line of text').
10+
= 'A line of text').

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpTo.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ testUpTo
66
self assert: (serverStream upTo: Character cr) = 'A line of text'.
77
[(Delay forSeconds: 1) wait.
88
clientStream nextPutAll: String cr; flush] fork.
9-
self assert: (serverStream upTo: Character cr) = 'with more text'.
9+
self assert: (serverStream upTo: Character cr) = 'with more text'.

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToAfterCloseSignaling.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ testUpToAfterCloseSignaling
44

55
clientStream nextPutAll:'A line of text'.
66
clientStream close.
7-
self should: [serverStream upTo: Character cr] raise: ConnectionClosed.
7+
self should: [serverStream upTo: Character cr] raise: ConnectionClosed.

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToAll.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ testUpToAll
66
self assert: (serverStream upToAll: String crlf) = 'A line of text'.
77
[(Delay forSeconds: 1) wait.
88
clientStream nextPutAll: String crlf; flush] fork.
9-
self assert: (serverStream upToAll: String crlf) = 'with more text'.
9+
self assert: (serverStream upToAll: String crlf) = 'with more text'.

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToAllAfterCloseSignaling.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ testUpToAllAfterCloseSignaling
44

55
clientStream nextPutAll:'A line of text'.
66
clientStream close.
7-
self should: [serverStream upToAll: String crlf] raise: ConnectionClosed.
7+
self should: [serverStream upToAll: String crlf] raise: ConnectionClosed.

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToAllTimeout.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ testUpToAllTimeout
44

55
clientStream nextPutAll: 'A line of text'.
66
serverStream timeout: 1.
7-
self should: [serverStream upToAll: String crlf] raise: ConnectionTimedOut.
7+
self should: [serverStream upToAll: String crlf] raise: ConnectionTimedOut.

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToEndClose.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ testUpToEndClose
55
clientStream nextPutAll:'A line of text'; flush.
66
[(Delay forMilliseconds: 100) wait.
77
clientStream close] fork.
8-
self assert: ((serverStream upToEnd) = 'A line of text').
8+
self assert: ((serverStream upToEnd) = 'A line of text').

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToEndCloseNonSignaling.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ testUpToEndCloseNonSignaling
77
[(Delay forMilliseconds: 100) wait.
88
clientStream close] fork.
99
self assert: ((serverStream upToEnd)
10-
= 'A line of text').
10+
= 'A line of text').

‎repository/SocketStream.package/SocketStreamTest.class/instance/testUpToTimeout.st

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ testUpToTimeout
44

55
clientStream nextPutAll: 'A line of text'.
66
serverStream timeout: 1.
7-
self should: [serverStream upTo: Character cr] raise: ConnectionTimedOut.
7+
self should: [serverStream upTo: Character cr] raise: ConnectionTimedOut.

0 commit comments

Comments
 (0)