Merge pull request msgpack#111 from doxxx/master

komamitsu · komamitsu · commit a319d8040684 · 2014-07-10T01:24:11.000+09:00
System property for disabling dynamic code generation.
diff --git a/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java b/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java
@@ -33,7 +33,8 @@ public class TemplateBuilderChain {
 			"org.msgpack.template.builder.ReflectionTemplateBuilder";
 
     private static boolean enableDynamicCodeGeneration() {
-        return !DalvikVmChecker.isDalvikVm();
+        return !DalvikVmChecker.isDalvikVm() &&
+            Boolean.parseBoolean(System.getProperties().getProperty("msgpack.dynamic-codegen.enabled", "true"));
     }
 
     protected List<TemplateBuilder> templateBuilders;

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public class TemplateBuilderChain {`
`33`	`33`	`"org.msgpack.template.builder.ReflectionTemplateBuilder";`
`34`	`34`
`35`	`35`	`private static boolean enableDynamicCodeGeneration() {`
`36`		`- return !DalvikVmChecker.isDalvikVm();`
	`36`	`+ return !DalvikVmChecker.isDalvikVm() &&`
	`37`	`+ Boolean.parseBoolean(System.getProperties().getProperty("msgpack.dynamic-codegen.enabled", "true"));`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`protected List<TemplateBuilder> templateBuilders;`