Don't admit primitive arrays as a generic Java varargs param.

They were sneaking through as polymorphic Arrays and avoiding boxing.

Closes SI-4216

1 files changed, 9 insertions, 7 deletions

diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index 0797b65fb0..4c5e0e408b 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -130,16 +130,18 @@ object ScalaRunTime {
     case null => throw new NullPointerException
   }
 
-  /** Convert a numeric value array to an object array.
+  /** Convert an array to an object array.
    *  Needed to deal with vararg arguments of primitive types that are passed
    *  to a generic Java vararg parameter T ...
    */
-  def toObjectArray(src: AnyRef): Array[Object] = {
-    val length = array_length(src)
-    val dest = new Array[Object](length)
-    for (i <- 0 until length)
-      array_update(dest, i, array_apply(src, i))
-    dest
+  def toObjectArray(src: AnyRef): Array[Object] = src match {
+    case x: Array[AnyRef] => x
+    case _ =>
+      val length = array_length(src)
+      val dest = new Array[Object](length)
+      for (i <- 0 until length)
+        array_update(dest, i, array_apply(src, i))
+      dest
   }
 
   def toArray[T](xs: collection.Seq[T]) = {