http://bugzilla/bugzilla/show_bug.cgi?id=3481 - Generate better UUIDs in Java.

http://bugzilla/bugzilla/show_bug.cgi?id=3482 - Deprecate generateUUID in Java and C# (java only).

7 files changed, 15 insertions, 31 deletions

diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/Map.java
index 495ccf7f721..282a533c6e0 100644
--- a/java/src/Freeze/Map.java
+++ b/java/src/Freeze/Map.java
@@ -110,7 +110,7 @@ public abstract class Map extends java.util.AbstractMap
                 //
                 // Rename existing database
                 //
-                String oldDbName = dbName + ".old-" + Ice.Util.generateUUID().replace(':', '-');
+                String oldDbName = dbName + ".old-" + java.util.UUID.randomUUID().toString();
 
                 if(connection.trace() >= 2)
                 {
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 0c1d31c38da..586a6f4a54d 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -418,7 +418,7 @@ public final class ObjectAdapterI implements ObjectAdapter
     {
         Identity ident = new Identity();
         ident.category = "";
-        ident.name = Util.generateUUID();
+        ident.name = java.util.UUID.randomUUID().toString();
 
         return addFacet(object, ident, facet);
     }
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index 4d9b5488691..6e516d1e5a1 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -202,29 +202,13 @@ public final class Util
         }
     }
 
-    public static synchronized String
+    /**
+     * @deprecated generateUUID() is deprecated, use java.util.UUID instead.
+     **/
+    public static String
     generateUUID()
     {
-        java.rmi.server.UID uid = new java.rmi.server.UID();
-
-        if(_localAddress == null)
-        {
-            java.net.InetAddress addr = IceInternal.Network.getLocalAddress(IceInternal.Network.EnableBoth);
-
-            byte[] ip = addr.getAddress();
-            _localAddress = "";
-            for(int i = 0; i < ip.length; i++)
-            {
-                if(i > 0)
-                {
-                    _localAddress += ":";
-                }
-                int n = ip[i] < 0 ? ip[i] + 256 : ip[i];
-                _localAddress += Integer.toHexString(n);
-            }
-        }
-
-        return _localAddress + ":" + uid;
+    	return java.util.UUID.randomUUID().toString();
     }
 
     public static int
diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java
index 84fc178a0dd..010a755984f 100644
--- a/java/src/IceGridGUI/Coordinator.java
+++ b/java/src/IceGridGUI/Coordinator.java
@@ -1436,7 +1436,7 @@ public class Coordinator
             if(registry.ice_getIdentity().equals(currentRegistry.ice_getIdentity()))
             {
                 Ice.Properties properties = _communicator.getProperties();
-                properties.setProperty("CollocInternal.AdapterId", Ice.Util.generateUUID());
+                properties.setProperty("CollocInternal.AdapterId", java.util.UUID.randomUUID().toString());
                 Ice.ObjectAdapter colloc = _communicator.createObjectAdapter("CollocInternal");
                 colloc.setLocator(null);
                 Ice.ObjectPrx router = colloc.addWithUUID(new ReuseConnectionRouter(defaultLocator));
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java
index 6ee81ee091d..ed0ba62bd0d 100644
--- a/java/src/IceGridGUI/SessionKeeper.java
+++ b/java/src/IceGridGUI/SessionKeeper.java
@@ -284,15 +284,15 @@ class SessionKeeper
             //
             // Create servants and proxies
             //
-            _applicationObserverIdentity.name = "application-" + Ice.Util.generateUUID();
+            _applicationObserverIdentity.name = "application-" + java.util.UUID.randomUUID().toString();
             _applicationObserverIdentity.category = category;
-            _adapterObserverIdentity.name = "adapter-" + Ice.Util.generateUUID();
+            _adapterObserverIdentity.name = "adapter-" + java.util.UUID.randomUUID().toString();
             _adapterObserverIdentity.category = category;
-            _objectObserverIdentity.name = "object-" + Ice.Util.generateUUID();
+            _objectObserverIdentity.name = "object-" + java.util.UUID.randomUUID().toString();
             _objectObserverIdentity.category = category;
-            _registryObserverIdentity.name = "registry-" + Ice.Util.generateUUID();
+            _registryObserverIdentity.name = "registry-" + java.util.UUID.randomUUID().toString();
             _registryObserverIdentity.category = category;
-            _nodeObserverIdentity.name = "node-" + Ice.Util.generateUUID();
+            _nodeObserverIdentity.name = "node-" + java.util.UUID.randomUUID().toString();
             _nodeObserverIdentity.category = category;
             
             ApplicationObserverI applicationObserverServant = new ApplicationObserverI(
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index a11d2044b66..601d8cbe452 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -374,7 +374,7 @@ public final class Instance
                     {
                         if(instanceName.length() == 0)
                         {
-                            instanceName = Ice.Util.generateUUID();
+                            instanceName = java.util.UUID.randomUUID().toString();
                         }
                         _adminIdentity = new Ice.Identity("admin", instanceName);
                         //
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index e7db028a7c3..b357ea6eb6f 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -174,7 +174,7 @@ public final class ObjectAdapterFactory
 
         if(name.length() == 0)
         {
-            String uuid = Ice.Util.generateUUID();
+            String uuid = java.util.UUID.randomUUID().toString();
             adapter = new Ice.ObjectAdapterI(_instance, _communicator, this, uuid, "", null, true);
             _adapters.put(uuid, adapter);
         }