MyWayToJavaJunior
diff --git a/‎src/main/java/org/msgpack/template/TemplateRegistry.java‎
Lines changed: 2 additions & 6 deletions b/‎src/main/java/org/msgpack/template/TemplateRegistry.java‎
Lines changed: 2 additions & 6 deletions
diff --git a/‎src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java‎
Lines changed: 7 additions & 2 deletions b/‎src/main/java/org/msgpack/template/builder/JavassistTemplateBuilder.java‎
Lines changed: 7 additions & 2 deletions
diff --git a/‎src/test/java/org/msgpack/TestSimpleArrays.java‎
Lines changed: 3 additions & 5 deletions b/‎src/test/java/org/msgpack/TestSimpleArrays.java‎
Lines changed: 3 additions & 5 deletions
@@ -301,12 +301,8 @@ private <T> Template<T> lookupAfterBuilding(Class<T> targetClass) {
         TemplateBuilder builder = chain.select(targetClass, true);
         Template<T> tmpl = null;
         if (builder != null) {
-            if (builder instanceof ArrayTemplateBuilder) {
-                tmpl = builder.loadTemplate(targetClass);
-            } else {
-                // TODO #MN for Android, we should modify here
-                tmpl = chain.getForceBuilder().loadTemplate(targetClass);
-            }
+            // TODO #MN for Android, we should modify here
+            tmpl = chain.getForceBuilder().loadTemplate(targetClass);
             if (tmpl != null) {
                 register(targetClass, tmpl);
                 return tmpl;
 
@@ -150,11 +150,16 @@ public <T> Template<T> loadTemplate(Type targetType) {
         // FIXME #MN must consider how to load "reference cycle class" in next
         // version
         Class<T> targetClass = (Class) targetType;
-        checkClassValidation(targetClass);
+        //checkClassValidation(targetClass);
         try {
             // check loadable
             String tmplName = targetClass.getName() + "_$$_Template";
-            targetClass.getClassLoader().loadClass(tmplName);
+            ClassLoader cl = targetClass.getClassLoader();
+            if (cl != null) {
+                cl.loadClass(tmplName);
+            } else {
+                return null;
+            }
         } catch (ClassNotFoundException e) {
             return null;
         }
 
@@ -17,8 +17,6 @@
 import org.msgpack.unpacker.BufferUnpacker;
 import org.msgpack.unpacker.Converter;
 
-
-@Ignore
 public class TestSimpleArrays {
 
     @Message
@@ -204,7 +202,7 @@ public GenericsTest() {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Test
+    @Ignore @Test
     public void testGenerics() throws Exception {
 	MessagePack msgpack = new MessagePack();
 
@@ -272,7 +270,7 @@ public Dim2Test() {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Test
+    @Ignore @Test
     public void testDim2() throws Exception {
 	MessagePack msgpack = new MessagePack();
 	Dim2Test t = new Dim2Test();
@@ -337,7 +335,7 @@ public Dim3Test() {
     }
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    @Test
+    @Ignore @Test
     public void testDim3() throws Exception {
 	MessagePack msgpack = new MessagePack();