Don't allow dynamic-codegen property to override Dalvik VM check.

gordontyler · gordontyler · commit 23f267ccb58e · 2014-07-04T11:45:56.000-04:00
diff --git a/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java b/src/main/java/org/msgpack/template/builder/TemplateBuilderChain.java
@@ -33,12 +33,8 @@ public class TemplateBuilderChain {
 			"org.msgpack.template.builder.ReflectionTemplateBuilder";
 
     private static boolean enableDynamicCodeGeneration() {
-        boolean enabled = !DalvikVmChecker.isDalvikVm();
-        String property = System.getProperty("msgpack.dynamic-codegen.enabled");
-        if (property != null) {
-            enabled = Boolean.parseBoolean(property);
-        }
-        return enabled;
+        return !DalvikVmChecker.isDalvikVm() &&
+            Boolean.parseBoolean(System.getProperties().getProperty("msgpack.dynamic-codegen.enabled", "true"));
     }
 
     protected List<TemplateBuilder> templateBuilders;
