adding calls to System.gc() in tests

37 files changed, 41 insertions, 2 deletions

diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java
index c9e4d4d219d..91abaa8e060 100644
--- a/java/test/Freeze/complex/Client.java
+++ b/java/test/Freeze/complex/Client.java
@@ -231,6 +231,7 @@ public class Client
 	    }
 	}
 
+	System.gc();
 	System.exit(status);
     }
 
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index feed9402bb8..0b8a76ef5b3 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -834,6 +834,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java
index 2b38aa92453..73c2218a135 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/Glacier2/router/Client.java
@@ -24,6 +24,7 @@ public class Client
 
         CallbackClient app = new CallbackClient();
         int status = app.main("Client", argsH.value);
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Glacier2/router/Server.java b/java/test/Glacier2/router/Server.java
index 48c9ccc1ed6..290409c07d0 100644
--- a/java/test/Glacier2/router/Server.java
+++ b/java/test/Glacier2/router/Server.java
@@ -14,6 +14,7 @@ public class Server
     {
         CallbackServer app = new CallbackServer();
         int status = app.main("Server", args);
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/Ice/adapterDeactivation/Client.java
index d0f4928caaf..370e5ef04e6 100644
--- a/java/test/Ice/adapterDeactivation/Client.java
+++ b/java/test/Ice/adapterDeactivation/Client.java
@@ -24,6 +24,7 @@ public class Client
     {
         TestClient app = new TestClient();
         int result = app.main("Client", args);
+        System.gc();
         System.exit(result);
     }
 }
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 8fa156c41f1..74b4f1363de 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -30,6 +30,7 @@ public class Server
     {
         TestServer app = new TestServer();
         int result = app.main("Server", args);
+	System.gc();
         System.exit(result);
     }
 }
diff --git a/java/test/Ice/checksum/client/Client.java b/java/test/Ice/checksum/client/Client.java
index 3ab7fecb756..1169e123594 100644
--- a/java/test/Ice/checksum/client/Client.java
+++ b/java/test/Ice/checksum/client/Client.java
@@ -47,6 +47,7 @@ public class Client
             }
         }
 
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/checksum/server/Server.java b/java/test/Ice/checksum/server/Server.java
index a5bbf57abb0..5ffba1e1298 100644
--- a/java/test/Ice/checksum/server/Server.java
+++ b/java/test/Ice/checksum/server/Server.java
@@ -51,6 +51,7 @@ public class Server
             }
         }
 
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java
index 5732de2dd65..afc658b81d3 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/Ice/custom/Client.java
@@ -49,6 +49,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java
index e92e447d147..46ce9dcbeb3 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/Ice/custom/Server.java
@@ -53,6 +53,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index 828a776a3f0..3cb96863dc6 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -49,6 +49,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java
index e565e4a5876..f05a3dc86c6 100644
--- a/java/test/Ice/exceptions/Server.java
+++ b/java/test/Ice/exceptions/Server.java
@@ -60,6 +60,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/exceptionsAMD/Server.java b/java/test/Ice/exceptionsAMD/Server.java
index e565e4a5876..f05a3dc86c6 100644
--- a/java/test/Ice/exceptionsAMD/Server.java
+++ b/java/test/Ice/exceptionsAMD/Server.java
@@ -60,6 +60,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index fbc7c563aa8..a657d308718 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -49,6 +49,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 1a1e5cbf568..94dbf1d7555 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -58,6 +58,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 4a84214a30c..0ab59c89654 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -110,6 +110,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index 856301bca8b..6b1d79b8c7d 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -102,6 +102,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index ab4b255e681..eda8a2c620f 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -49,6 +49,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index 0063884c477..cc91207f7f5 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -51,6 +51,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index 8039a7fa1dc..12bf01002f0 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -48,6 +48,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java
index 6b30d3b72a3..ac75e2c96cc 100644
--- a/java/test/Ice/location/Server.java
+++ b/java/test/Ice/location/Server.java
@@ -75,6 +75,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index b821ff1d413..2ef6ce07276 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -82,6 +82,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index 0063884c477..cc91207f7f5 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -51,6 +51,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/operationsAMD/Server.java b/java/test/Ice/operationsAMD/Server.java
index 9991fe4c571..52656926a3a 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -62,6 +62,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/package/Client.java b/java/test/Ice/package/Client.java
index 86d8916e82d..735dbeda12a 100644
--- a/java/test/Ice/package/Client.java
+++ b/java/test/Ice/package/Client.java
@@ -47,6 +47,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/package/Server.java b/java/test/Ice/package/Server.java
index 666e5e40cfe..e5382fac7cf 100644
--- a/java/test/Ice/package/Server.java
+++ b/java/test/Ice/package/Server.java
@@ -51,6 +51,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/exceptions/csrc/Client.java b/java/test/Ice/slicing/exceptions/csrc/Client.java
index 6ef393bfda9..1791c9852b5 100644
--- a/java/test/Ice/slicing/exceptions/csrc/Client.java
+++ b/java/test/Ice/slicing/exceptions/csrc/Client.java
@@ -49,6 +49,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/exceptions/ssrc/Server.java b/java/test/Ice/slicing/exceptions/ssrc/Server.java
index 7ad1f1a2de9..48368f782dc 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/Server.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java
@@ -53,6 +53,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java
index 7ad1f1a2de9..48368f782dc 100644
--- a/java/test/Ice/slicing/exceptionsAMD/Server.java
+++ b/java/test/Ice/slicing/exceptionsAMD/Server.java
@@ -53,6 +53,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/objects/csrc/Client.java b/java/test/Ice/slicing/objects/csrc/Client.java
index 6ef393bfda9..1791c9852b5 100644
--- a/java/test/Ice/slicing/objects/csrc/Client.java
+++ b/java/test/Ice/slicing/objects/csrc/Client.java
@@ -49,6 +49,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/objects/ssrc/Server.java b/java/test/Ice/slicing/objects/ssrc/Server.java
index 7ad1f1a2de9..48368f782dc 100644
--- a/java/test/Ice/slicing/objects/ssrc/Server.java
+++ b/java/test/Ice/slicing/objects/ssrc/Server.java
@@ -53,6 +53,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java
index 7ad1f1a2de9..48368f782dc 100644
--- a/java/test/Ice/slicing/objectsAMD/Server.java
+++ b/java/test/Ice/slicing/objectsAMD/Server.java
@@ -53,6 +53,7 @@ public class Server
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index 1cbc1162738..a0d2e7f0f1a 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -477,6 +477,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/IcePack/deployer/Client.java b/java/test/IcePack/deployer/Client.java
index bf172cb8f81..99dc591e5f8 100644
--- a/java/test/IcePack/deployer/Client.java
+++ b/java/test/IcePack/deployer/Client.java
@@ -64,6 +64,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/IcePack/deployer/Server.java b/java/test/IcePack/deployer/Server.java
index 43c9fd67589..c9b4850777f 100644
--- a/java/test/IcePack/deployer/Server.java
+++ b/java/test/IcePack/deployer/Server.java
@@ -38,6 +38,8 @@ public class Server extends Ice.Application
     main(String[] args)
     {
 	Server server = new Server();
-	server.main("test.IcePack.deploy.Server", args);
+	int status = server.main("test.IcePack.deploy.Server", args);
+	System.gc();
+	System.exit(status);
     }
 }
diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java
index 13a28193eec..275e3842966 100644
--- a/java/test/IcePack/simple/Client.java
+++ b/java/test/IcePack/simple/Client.java
@@ -73,6 +73,7 @@ public class Client
             }
         }
 
+        System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/IcePack/simple/Server.java b/java/test/IcePack/simple/Server.java
index f12e9d093d3..1115810bdad 100644
--- a/java/test/IcePack/simple/Server.java
+++ b/java/test/IcePack/simple/Server.java
@@ -35,6 +35,8 @@ public class Server extends Ice.Application
     main(String[] args)
     {
 	Server server = new Server();
-	server.main("test.IcePack.simple.Server", args);
+	int status = server.main("test.IcePack.simple.Server", args);
+	System.gc();
+	System.exit(status);
     }
 }