[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - ridljar/com

[Damjan Jovanovic]

 ridljar/com/sun/star/uno/UnoRuntime.java |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit ce2712be6e755c50fb611430bc5899a9a80552dd
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sun Aug 20 06:22:29 2017 +0000

    i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably
    
    In the Java UNO bridge, UnoRuntime.generateOid() generated the
    object-specific part of the OID using java.lang.Object.hashCode(),
    which is only 32 bits long, and is commonly overriden and could thus
    return values from an even smaller range, so OID collisions were quite
    likely.
    
    This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
    object-specific part of the OID, and store these in an object => oid
    java.util.WeakHashMap, making OID collisions almost impossible.
    
    Patch by: me
    Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
    googlemail dot com)
    
    (cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118)
    
    Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95
    Reviewed-on: https://gerrit.libreoffice.org/41576
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 3f84390f585cf71331a77ab5ca632cacaf3ad7b9)

diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java b/ridljar/com/sun/star/uno/UnoRuntime.java
index 4bedc275c451..2b70ed92ea8b 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -23,6 +23,8 @@ import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.UUID;
+import java.util.WeakHashMap;
 
 import com.sun.star.lib.uno.typedesc.FieldDescription;
 import com.sun.star.lib.uno.typedesc.TypeDescription;
@@ -106,7 +108,16 @@ public class UnoRuntime {
         if (object instanceof IQueryInterface) {
             oid = ((IQueryInterface) object).getOid();
         }
-        return oid == null ? object.hashCode() + oidSuffix : oid;
+        if (oid == null) {
+            synchronized (oidMap) {
+                 oid = oidMap.get(object);
+                 if (oid == null) {
+                     oid = UUID.randomUUID().toString() + oidSuffix;
+                     oidMap.put(object, oid);
+                 }
+            }
+        }
+        return oid;
     }
 
     /**
@@ -690,6 +701,7 @@ public class UnoRuntime {
         private final IBridge bridge;
     }
 
+    private static final WeakHashMap<Object,String> oidMap = new WeakHashMap<Object,String>();
     private static final String uniqueKeyHostPrefix
     = Integer.toString(new Object().hashCode(), 16) + ":";
     private static final Object uniqueKeyLock = new Object();