Merge pull request #31 from GsDevKit/issue_29

dalehenrich · dalehenrich · commit cf0cd233f81e · 2015-04-03T15:54:28.000-07:00
fix for Issue 29
diff --git a/.travis.yml b/.travis.yml
@@ -18,9 +18,7 @@ env:
    - ST=GemStone-3.0.1 
    - ST=GemStone-3.1.0.6
    - ST=GemStone-3.2.0
-   - ST=GemStone-3.2.1
-   - ST=GemStone-3.2.2
-   - ST=GemStone-3.2.3
+   - ST=GemStone-3.2.6
 
 install:
    - export PROJECT_HOME="$(pwd)"
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/basicTransactionReentry.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/basicTransactionReentry.st
@@ -1,5 +1,7 @@
 accessing
 basicTransactionReentry
   basicTransactionReentry value
-    ifNil: [ basicTransactionReentry value: self reentryAllowed ].
+    ifNil: [ 
+      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.."
+      basicTransactionReentry value: self reentryAllowed ].
   ^ basicTransactionReentry value
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st
@@ -1,3 +1,3 @@
 server specialization
 isRunning
-	^self serverClass isRunning
+	^self serverClass isRunning
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st
@@ -2,4 +2,4 @@ accessing
 name
 
 	name == nil ifTrue: [ ^self serverClass name ].
-	^name
+	^name
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json b/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json
@@ -18,7 +18,7 @@
 		"basicServerOn:" : "dkh 01/03/2015 15:54",
 		"basicServerProcess" : "dkh 01/02/2015 17:13",
 		"basicServerProcess:" : "dkh 01/02/2015 17:13",
-		"basicTransactionReentry" : "dkh 01/09/2015 14:20",
+		"basicTransactionReentry" : "dkh 04/03/2015 11:44",
 		"basicTransactionReentry:" : "dkh 01/09/2015 13:16",
 		"bounceServerAfterSetOrClearBreakpoints:" : "dkh 12/09/2014 14:12",
 		"bounceServerForBreakpointHandling" : "dkh 12/10/2014 14:48",
@@ -79,7 +79,7 @@
 		"initialize" : "dkh 01/09/2015 14:21",
 		"interactiveMode" : "dkh 12/22/2014 12:55",
 		"interactiveMode:" : "dkh 12/22/2014 12:57",
-		"interactiveStartServiceOn:" : "dkh 01/06/2015 15:51",
+		"interactiveStartServiceOn:" : "dkh 01/16/2015 11:54",
 		"interactiveStartServiceOn:transactionMode:" : "dkh 01/06/2015 15:50",
 		"isRunning" : "SebastianHeidbrink 11/02/2014 15:00",
 		"isValidName:" : "dkh 11/26/2014 18:31",
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st
@@ -1,4 +1,4 @@
 accessing
 block: anObject
 
-   block := anObject
+   block := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st
@@ -1,4 +1,4 @@
 accessing
 nativeProcess: anObject
 
-   nativeProcess := anObject
+   nativeProcess := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st
@@ -1,4 +1,4 @@
 accessing
 nativeProcess
 
-   ^nativeProcess
+   ^nativeProcess
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st
@@ -1,4 +1,4 @@
 accessing
 nativeSemaphore: anObject
 
-   nativeSemaphore := anObject
+   nativeSemaphore := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st
@@ -1,4 +1,4 @@
 accessing
 portableProcess: anObject
 
-   portableProcess := anObject
+   portableProcess := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st
@@ -1,4 +1,4 @@
 accessing
 portableProcess
 
-   ^portableProcess
+   ^portableProcess
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st
@@ -1,4 +1,4 @@
 accessing
 portableSemaphore: anObject
 
-   portableSemaphore := anObject
+   portableSemaphore := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st
@@ -1,3 +1,3 @@
 gem server querying
 gemServerNamed: aString
-	^self singleton serverNamed: aString
+	^self singleton serverNamed: aString
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st
@@ -1,3 +1,3 @@
 gem server querying
 gemServerNames
-	^self singleton names asSortedCollection
+	^self singleton names asSortedCollection
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st
@@ -1,3 +1,3 @@
 instance creation
 new
-	^self singleton
+	^self singleton
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st
@@ -1,4 +1,4 @@
 registration
 removeGemServerNamed: aName
 	self singleton removeServer: aName
-.
+.
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st
@@ -1,3 +1,3 @@
 gem server querying
 serverGems
-	^self singleton servers
+	^self singleton servers
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st
@@ -1,3 +1,3 @@
 gem server querying
 serversOnPort: aPortNumber
-	^self singleton serversOnPort: aPortNumber
+	^self singleton serversOnPort: aPortNumber
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st
@@ -2,4 +2,4 @@ accessing
 singleton
 	
 	Singleton isNil ifTrue: [self initSingleton].
-	^Singleton
+	^Singleton
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st
@@ -3,4 +3,4 @@ addServer: aServer
 	(self serverNamed: aServer name) notNil 
 		ifTrue: [^Error error: 'Server with that name already exists!'].
 
-	self servers add: aServer
+	self servers add: aServer
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st
@@ -1,4 +1,4 @@
 other
 names
 
-	^self servers collect:[:each | each name].
+	^self servers collect:[:each | each name].
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st
@@ -2,4 +2,4 @@ other
 removeServer: aName
 	|server|
 	server :=self serverNamed:aName.
-	server == nil ifFalse:[ servers remove: server]
+	server == nil ifFalse:[ servers remove: server]
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st
@@ -1,4 +1,4 @@
 other
 serverClasses
 
-	^self servers collect:[:each | each serverClass].
+	^self servers collect:[:each | each serverClass].
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st
@@ -1,3 +1,3 @@
 other
 serverNamed: aString
-	^self servers detect:[:each | each name = aString] ifNone:[nil]
+	^self servers detect:[:each | each name = aString] ifNone:[nil]
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st
@@ -1,3 +1,3 @@
 other
 servers
-	^servers
+	^servers
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st
@@ -1,3 +1,3 @@
 other
 serversOfClass: aClassName
-	^servers select: [:each | each serverClass name = aClassName]
+	^servers select: [:each | each serverClass name = aClassName]
diff --git a/repository/GsApplicationTools-Server.package/monticello.meta/version b/repository/GsApplicationTools-Server.package/monticello.meta/version

-Original file line number
+Diff line change
 name
 	name == nil ifTrue: [ ^self serverClass name ].
 -	^name
 +	^name