Made finalizers thread-safe.

30 files changed, 31 insertions, 28 deletions

diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index 0b8a76ef5b3..2b4a8fd391a 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -834,7 +834,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Freeze/evictor/Server.java b/java/test/Freeze/evictor/Server.java
index 13bd4a52b72..47decb48028 100644
--- a/java/test/Freeze/evictor/Server.java
+++ b/java/test/Freeze/evictor/Server.java
@@ -100,6 +100,7 @@ public class Server
             }
         }
 
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java
index 73c2218a135..682484d53ee 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/Glacier2/router/Client.java
@@ -24,7 +24,7 @@ public class Client
 
         CallbackClient app = new CallbackClient();
         int status = app.main("Client", argsH.value);
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Glacier2/router/Server.java b/java/test/Glacier2/router/Server.java
index 290409c07d0..9a40cc706a8 100644
--- a/java/test/Glacier2/router/Server.java
+++ b/java/test/Glacier2/router/Server.java
@@ -14,7 +14,7 @@ public class Server
     {
         CallbackServer app = new CallbackServer();
         int status = app.main("Server", args);
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/adapterDeactivation/ServantLocatorI.java b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
index 0244c3403a4..c266800efe6 100644
--- a/java/test/Ice/adapterDeactivation/ServantLocatorI.java
+++ b/java/test/Ice/adapterDeactivation/ServantLocatorI.java
@@ -17,7 +17,7 @@ public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.Se
         _deactivated = false;
     }
 
-    protected void
+    protected synchronized void
     finalize()
         throws Throwable
     {
@@ -55,7 +55,7 @@ public final class ServantLocatorI extends Ice.LocalObjectImpl implements Ice.Se
         test(co.message().equals("blahblah"));
     }
 
-    public void
+    public synchronized void
     deactivate(String category)
     {
         test(!_deactivated);
diff --git a/java/test/Ice/custom/Client.java b/java/test/Ice/custom/Client.java
index afc658b81d3..c82456710aa 100644
--- a/java/test/Ice/custom/Client.java
+++ b/java/test/Ice/custom/Client.java
@@ -49,7 +49,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/custom/Server.java b/java/test/Ice/custom/Server.java
index 46ce9dcbeb3..1e066170427 100644
--- a/java/test/Ice/custom/Server.java
+++ b/java/test/Ice/custom/Server.java
@@ -53,7 +53,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/exceptions/Client.java b/java/test/Ice/exceptions/Client.java
index 3cb96863dc6..06c5df1c1ce 100644
--- a/java/test/Ice/exceptions/Client.java
+++ b/java/test/Ice/exceptions/Client.java
@@ -49,7 +49,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/facets/Client.java b/java/test/Ice/facets/Client.java
index a657d308718..853f23195fe 100644
--- a/java/test/Ice/facets/Client.java
+++ b/java/test/Ice/facets/Client.java
@@ -49,7 +49,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java
index 94dbf1d7555..b0463d48fbb 100644
--- a/java/test/Ice/facets/Server.java
+++ b/java/test/Ice/facets/Server.java
@@ -58,7 +58,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 0ab59c89654..4185cb4acdb 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -110,7 +110,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java
index eda8a2c620f..916895de2e6 100644
--- a/java/test/Ice/inheritance/Client.java
+++ b/java/test/Ice/inheritance/Client.java
@@ -49,7 +49,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java
index cc91207f7f5..22ed28eeb73 100644
--- a/java/test/Ice/inheritance/Server.java
+++ b/java/test/Ice/inheritance/Server.java
@@ -51,7 +51,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/location/Client.java b/java/test/Ice/location/Client.java
index 12bf01002f0..c812365ead7 100644
--- a/java/test/Ice/location/Client.java
+++ b/java/test/Ice/location/Client.java
@@ -48,7 +48,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/objects/Client.java b/java/test/Ice/objects/Client.java
index 2ef6ce07276..d0f5946b2a9 100644
--- a/java/test/Ice/objects/Client.java
+++ b/java/test/Ice/objects/Client.java
@@ -82,7 +82,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java
index cc91207f7f5..22ed28eeb73 100644
--- a/java/test/Ice/objects/Server.java
+++ b/java/test/Ice/objects/Server.java
@@ -51,7 +51,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/operations/Client.java b/java/test/Ice/operations/Client.java
index 4b556028eb7..3edf4d4c3fd 100644
--- a/java/test/Ice/operations/Client.java
+++ b/java/test/Ice/operations/Client.java
@@ -76,6 +76,7 @@ public class Client
             }
         }
 
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/operations/Server.java b/java/test/Ice/operations/Server.java
index beeb7b1a292..7c779ab14e8 100644
--- a/java/test/Ice/operations/Server.java
+++ b/java/test/Ice/operations/Server.java
@@ -62,6 +62,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 52656926a3a..64ea330e44b 100644
--- a/java/test/Ice/operationsAMD/Server.java
+++ b/java/test/Ice/operationsAMD/Server.java
@@ -62,7 +62,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/package/Client.java b/java/test/Ice/package/Client.java
index 735dbeda12a..bc9f39bdd00 100644
--- a/java/test/Ice/package/Client.java
+++ b/java/test/Ice/package/Client.java
@@ -47,7 +47,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/package/Server.java b/java/test/Ice/package/Server.java
index e5382fac7cf..7084884fabd 100644
--- a/java/test/Ice/package/Server.java
+++ b/java/test/Ice/package/Server.java
@@ -51,7 +51,7 @@ public class Server
             }
         }
 
-        System.gc();
+	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 1791c9852b5..e74fd1cfad9 100644
--- a/java/test/Ice/slicing/exceptions/csrc/Client.java
+++ b/java/test/Ice/slicing/exceptions/csrc/Client.java
@@ -49,7 +49,7 @@ public class Client
             }
         }
 
-        System.gc();
+	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 48368f782dc..4eb9cdc28ae 100644
--- a/java/test/Ice/slicing/exceptions/ssrc/Server.java
+++ b/java/test/Ice/slicing/exceptions/ssrc/Server.java
@@ -53,7 +53,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/exceptionsAMD/Server.java b/java/test/Ice/slicing/exceptionsAMD/Server.java
index 48368f782dc..4eb9cdc28ae 100644
--- a/java/test/Ice/slicing/exceptionsAMD/Server.java
+++ b/java/test/Ice/slicing/exceptionsAMD/Server.java
@@ -53,7 +53,7 @@ public class Server
             }
         }
 
-        System.gc();
+	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 1791c9852b5..e74fd1cfad9 100644
--- a/java/test/Ice/slicing/objects/csrc/Client.java
+++ b/java/test/Ice/slicing/objects/csrc/Client.java
@@ -49,7 +49,7 @@ public class Client
             }
         }
 
-        System.gc();
+	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 48368f782dc..4eb9cdc28ae 100644
--- a/java/test/Ice/slicing/objects/ssrc/Server.java
+++ b/java/test/Ice/slicing/objects/ssrc/Server.java
@@ -53,7 +53,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/slicing/objectsAMD/Server.java b/java/test/Ice/slicing/objectsAMD/Server.java
index 48368f782dc..4eb9cdc28ae 100644
--- a/java/test/Ice/slicing/objectsAMD/Server.java
+++ b/java/test/Ice/slicing/objectsAMD/Server.java
@@ -53,7 +53,7 @@ public class Server
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index a0d2e7f0f1a..b6c3cd457e2 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -477,7 +477,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/IcePack/deployer/Client.java b/java/test/IcePack/deployer/Client.java
index 99dc591e5f8..da8be540bc3 100644
--- a/java/test/IcePack/deployer/Client.java
+++ b/java/test/IcePack/deployer/Client.java
@@ -64,7 +64,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }
diff --git a/java/test/IcePack/simple/Client.java b/java/test/IcePack/simple/Client.java
index 275e3842966..71bab6fdb99 100644
--- a/java/test/IcePack/simple/Client.java
+++ b/java/test/IcePack/simple/Client.java
@@ -73,7 +73,7 @@ public class Client
             }
         }
 
-        System.gc();
+	System.gc();
         System.exit(status);
     }
 }