xmbsn
diff --git a/‎src/main/java/org/msgpack/MessagePack.java‎
Lines changed: 4 additions & 0 deletions b/‎src/main/java/org/msgpack/MessagePack.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/main/java/org/msgpack/template/TemplateRegistry.java‎
Lines changed: 4 additions & 0 deletions b/‎src/main/java/org/msgpack/template/TemplateRegistry.java‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java‎
Lines changed: 11 additions & 4 deletions b/‎src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java‎
Lines changed: 11 additions & 4 deletions
@@ -47,6 +47,10 @@ public MessagePack(MessagePack msgpack) {
         registry = new TemplateRegistry(msgpack.registry);
     }
 
+    public void setClassLoader(final ClassLoader cl) {
+	registry.setClassLoader(cl);
+    }
+
     public Packer createPacker(OutputStream stream) {
         return new MessagePackPacker(this, stream);
     }
 
@@ -90,6 +90,10 @@ public TemplateRegistry(TemplateRegistry registry) {
 	genericCache = parent.genericCache;
     }
 
+    public void setClassLoader(final ClassLoader cl) {
+	chain = new TemplateBuilderChain(this, cl);
+    }
+
     private void registerTemplates() {
         register(boolean.class, BooleanTemplate.getInstance());
         register(Boolean.class, BooleanTemplate.getInstance());
 
@@ -36,12 +36,16 @@ private static boolean enableDynamicCodeGeneration(){
 
     protected List<TemplateBuilder> templateBuilders;
 
-    public TemplateBuilderChain(TemplateRegistry registry) {
+    public TemplateBuilderChain(final TemplateRegistry registry) {
+	this(registry, null);
+    }
+
+    public TemplateBuilderChain(final TemplateRegistry registry, final ClassLoader cl) {
 	templateBuilders = new ArrayList<TemplateBuilder>();
-	init(registry);
+	reset(registry, cl);
     }
 
-    private void init(TemplateRegistry registry) {
+    private void reset(final TemplateRegistry registry, final ClassLoader cl) {
 	if (registry == null) {
 	    throw new NullPointerException("registry is null");
 	}
@@ -51,6 +55,9 @@ private void init(TemplateRegistry registry) {
 	templateBuilders.add(new OrdinalEnumTemplateBuilder(registry));
 	if (enableDynamicCodeGeneration()) { // use dynamic code generation
 	    builder = new JavassistTemplateBuilder(registry);
+	    if (cl != null) {
+		((JavassistTemplateBuilder) builder).addClassLoader(cl);
+	    }
 	    templateBuilders.add(builder);
 	    templateBuilders.add(new JavassistBeansTemplateBuilder(registry));
 	} else { // use reflection
@@ -61,7 +68,7 @@ private void init(TemplateRegistry registry) {
 	}
     }
 
-    public TemplateBuilder select(Type targetType, boolean hasAnnotation) {
+    public TemplateBuilder select(final Type targetType, final boolean hasAnnotation) {
 	for (TemplateBuilder tb : templateBuilders) {
 	    if (tb.matchType(targetType, hasAnnotation)) {
 		return tb;
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,10 @@ public MessagePack(MessagePack msgpack) {`
`47`	`47`	`registry = new TemplateRegistry(msgpack.registry);`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ public void setClassLoader(final ClassLoader cl) {`
	`51`	`+ registry.setClassLoader(cl);`
	`52`	`+ }`
	`53`	`+`
`50`	`54`	`public Packer createPacker(OutputStream stream) {`
`51`	`55`	`return new MessagePackPacker(this, stream);`
`52`	`56`	`}`