X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FReflection.java;h=de614d0628978e9e791c765f9659e1e7cedda838;hb=fef7d888b519acbf0a4ac9cb0a29feda77a494b3;hp=beb8d419ec9dac666507e5821f546d31926fde58;hpb=0db242407cbae04f1a55086bf2bd31f5ae1bb7a8;p=sbp.git

diff --git a/src/edu/berkeley/sbp/util/Reflection.java b/src/edu/berkeley/sbp/util/Reflection.java
index beb8d41..de614d0 100644
--- a/src/edu/berkeley/sbp/util/Reflection.java
+++ b/src/edu/berkeley/sbp/util/Reflection.java
@@ -50,10 +50,18 @@ public final class Reflection {
         return (Object[])Array.newInstance(c, i);
     }
 
+    public static Object lub(Object argo) {
+        if (argo instanceof Object[]) return lub((Object[])argo);
+        return argo;
+    }
     public static Object[] lub(Object[] argo) {
         if (argo==null) return null;
         Class c = null;
-        for(Object o : argo) if (o != null) c = Reflection.lub(c, o.getClass());
+        for(int i=0; i<argo.length; i++) {
+            if (argo[i]==null) continue;
+            argo[i] = lub(argo[i]);
+            c = Reflection.lub(c, argo[i].getClass());
+        }
         if (c==null) c = Object.class;
         Object[] ret = Reflection.newArray(c, argo.length);
         System.arraycopy(argo, 0, ret, 0, argo.length);
@@ -66,9 +74,15 @@ public final class Reflection {
         if (a==b) return a;
         if (a.isAssignableFrom(b)) return a;
         if (b.isAssignableFrom(a)) return b;
+        if (a.isArray() && b.isArray())
+            return arrayClass(lub(a.getComponentType(), b.getComponentType()));
         return lub(b, a.getSuperclass());
     }
 
+    public static Class arrayClass(Class c) {
+        return Reflection.newArray(c, 0).getClass();
+    }
+
     /** a version of <tt>Class.forName</tt> that returns <tt>null</tt> instead of throwing an exception */
     public static Class forNameOrNull(String s) {
         try {