List of registered ext types must be listed by typeId, not class

Because ext types for unpacker may be registered without class (just only with proc)
msgpack · Oct 23, 2015 · 654de1b · 654de1b
1 parent 6ee1b67
commit 654de1b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ext/java/org/msgpack/jruby/ExtensionRegistry.java b/ext/java/org/msgpack/jruby/ExtensionRegistry.java
@@ -48,9 +48,10 @@ public IRubyObject toInternalPackerRegistry(ThreadContext ctx) {
 
   public IRubyObject toInternalUnpackerRegistry(ThreadContext ctx) {
     RubyHash hash = RubyHash.newHash(ctx.getRuntime());
-    for (ExtensionEntry entry : extensionsByClass.values()) {
-      IRubyObject typeId = RubyFixnum.newFixnum(ctx.getRuntime(), entry.getTypeId());
-      if (entry.hasUnpacker()) {
+    for (int typeIdIndex = 0 ; typeIdIndex < 256 ; typeIdIndex++) {
+      ExtensionEntry entry = extensionsByTypeId[typeIdIndex];
+      if (entry != null && entry.hasUnpacker()) {
+        IRubyObject typeId = RubyFixnum.newFixnum(ctx.getRuntime(), typeIdIndex - 128);
         hash.put(typeId, entry.toUnpackerTuple(ctx));
       }
     }