MONDRIAN-PACINO: Fixes a compilation problem with ArraySortedSet.merg…

…e on JDK 1.5 and earlier. Arrays.copyOf didn't exist until JDK 1.6. [git-p4: depot-paths = "//open/mondrian-release/pacino/": change = 14805]
pentaho · Nov 28, 2011 · d76b267 · d76b267
1 parent 9a4c33c
commit d76b267
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/mondrian/util/ArraySortedSet.java b/src/main/mondrian/util/ArraySortedSet.java
@@ -207,9 +207,10 @@ public ArraySortedSet<E> merge(
         }
 
         if (m < k) {
-            merged = Arrays.copyOf(merged, m);
+            return new ArraySortedSet<E>(merged, 0, m);
+        } else {
+            return new ArraySortedSet<E>(merged);
         }
-        return new ArraySortedSet<E>(merged);
     }
 
     @Override