diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-10-15 12:42:49 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2009-01-09 11:58:49 -0330 |
| commit | 33d494280e53b6741a5390756f8411eba37a9ecc (patch) | |
| tree | c012db2df93c85330777fff302ee4a69075bc237 /java/src/Ice/Util.java | |
| parent | Merge commit 'origin/R3_3_branch' (diff) | |
| download | ice-33d494280e53b6741a5390756f8411eba37a9ecc.tar.bz2 ice-33d494280e53b6741a5390756f8411eba37a9ecc.tar.xz ice-33d494280e53b6741a5390756f8411eba37a9ecc.zip | |
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).
Diffstat (limited to 'java/src/Ice/Util.java')
| -rw-r--r-- | java/src/Ice/Util.java | 26 |
1 files changed, 5 insertions, 21 deletions
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 |