Fix Channel.getAll to correctly convert results to Orc values.

orc-lang · Feb 17, 2017 · a84754f · a84754f
1 parent b8e3770
commit a84754f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/OrcScala/src/orc/lib/state/Channel.java b/OrcScala/src/orc/lib/state/Channel.java
@@ -11,6 +11,7 @@
 
 package orc.lib.state;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 
 import orc.Handle;
@@ -152,7 +153,11 @@ public boolean nonBlocking() {
                 @Override
                 public Object evaluate(final Args args) throws TokenException {
                     synchronized (ChannelInstance.this) {
-                        final Object out = scala.collection.JavaConversions.collectionAsScalaIterable(contents).toList();
+                        ArrayList<Object> convertedContents = new ArrayList<>(contents.size());
+                        for(Object o : contents) {
+                          convertedContents.add(object2value(o));
+                        }
+                        final Object out = scala.collection.JavaConversions.collectionAsScalaIterable(convertedContents).toList();
                         contents.clear();
                         if (closer != null) {
                             closer.publish(signal());

diff --git a/OrcScala/src/orc/run/core/Token.scala b/OrcScala/src/orc/run/core/Token.scala
@@ -725,7 +725,9 @@ class Token protected (
 
   def publish(v: Option[AnyRef]) {
     v foreach { vv =>
-      assert(!vv.isInstanceOf[Binding])
+      assert(!vv.isInstanceOf[Binding], s"Interpreter bug. Triggered at $this")
+      assert(!vv.isInstanceOf[java.math.BigInteger], s"Type coercion error at $this")
+      assert(!vv.isInstanceOf[java.math.BigDecimal], s"Type coercion error at $this")
     }
     state match {
       case Blocked(_: OtherwiseGroup) => throw new AssertionError("publish on a pending Token")