From 1da67180edabae820e99fd14d8139c87e1ced742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 13 Mar 2015 20:18:01 +0100 Subject: [PATCH] Fix sets not being converted properly for Lua (e.g. the result of `me_controller.getCpus()` was being `toString`ed). --- src/main/scala/li/cil/oc/server/driver/Registry.scala | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/scala/li/cil/oc/server/driver/Registry.scala b/src/main/scala/li/cil/oc/server/driver/Registry.scala index a4c540c8d..811ad3c87 100644 --- a/src/main/scala/li/cil/oc/server/driver/Registry.scala +++ b/src/main/scala/li/cil/oc/server/driver/Registry.scala @@ -130,12 +130,14 @@ private[oc] object Registry extends api.detail.DriverAPI { case arg: Array[_] => convertList(arg, arg.zipWithIndex.iterator, memo) case arg: Product => convertList(arg, arg.productIterator.zipWithIndex, memo) case arg: Seq[_] => convertList(arg, arg.zipWithIndex.iterator, memo) - case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo) case arg: Map[_, _] => convertMap(arg, arg, memo) case arg: mutable.Map[_, _] => convertMap(arg, arg.toMap, memo) case arg: java.util.Map[_, _] => convertMap(arg, arg.toMap, memo) + case arg: Iterable[_] => convertList(arg, arg.zipWithIndex.toIterator, memo) + case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo) + case arg => val converted = new util.HashMap[AnyRef, AnyRef]() memo += arg -> converted