MyWayToJavaJunior
diff --git a/‎src/main/java/org/msgpack/template/OrdinalEnumTemplate.java‎
Lines changed: 13 additions & 2 deletions b/‎src/main/java/org/msgpack/template/OrdinalEnumTemplate.java‎
Lines changed: 13 additions & 2 deletions
diff --git a/‎src/test/java/org/msgpack/unpacker/TestReadTemplate.java‎
Lines changed: 2 additions & 2 deletions b/‎src/test/java/org/msgpack/unpacker/TestReadTemplate.java‎
Lines changed: 2 additions & 2 deletions
@@ -39,17 +39,28 @@ public OrdinalEnumTemplate(Class<T> targetClass) {
 
     @Override
     public void write(Packer pk, T target, boolean required) throws IOException {
+        if (target == null) {
+            if (required) {
+                throw new MessageTypeException("Attempted to write null");
+            }
+            pk.writeNil();
+            return;
+        }
 	Integer ordinal = reverse.get(target);
-        if(ordinal == null) {
+        if (ordinal == null) {
             throw new MessageTypeException(new IllegalArgumentException("ordinal: " + ordinal));
         }
         pk.write((int)ordinal);
     }
 
     @Override
     public T read(Unpacker pac, T to, boolean required) throws IOException, MessageTypeException {
+	if (!required && pac.trySkipNil()) {
+	    return null;
+	}
+
         int ordinal = pac.readInt();
-        if(entries.length <= ordinal) {
+        if (entries.length <= ordinal) {
                 throw new MessageTypeException(new IllegalArgumentException("ordinal: " + ordinal));
         }
         return entries[ordinal];
 
@@ -84,8 +84,8 @@ public void testReadTemplateNull() throws IOException {
         Collection<Long> tcollection = u().read(tCollection(TLong));
         assertNull(tcollection);
 
-        //MyEnum tordinalenum = u().read(tOrdinalEnum(MyEnum.class));
-        //assertNull(tordinalenum);
+        MyEnum tordinalenum = u().read(tOrdinalEnum(MyEnum.class));
+        assertNull(tordinalenum);
     }
 
     // return unpacker that can read a nil
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ public void testReadTemplateNull() throws IOException {`
`84`	`84`	`Collection<Long> tcollection = u().read(tCollection(TLong));`
`85`	`85`	`assertNull(tcollection);`
`86`	`86`
`87`		`- //MyEnum tordinalenum = u().read(tOrdinalEnum(MyEnum.class));`
`88`		`- //assertNull(tordinalenum);`
	`87`	`+ MyEnum tordinalenum = u().read(tOrdinalEnum(MyEnum.class));`
	`88`	`+ assertNull(tordinalenum);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`// return unpacker that can read a nil`