type demotion ON by default. runMinimalMemory OFF by default

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 315e8b63baf362ea93f43b8afab508c50973c7bc..274b22e5e24c28b453ce79cd3fdb20590cee8f38 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -911,7 +911,7 @@ public abstract class World implements Dump.INode {
 
                private static boolean debug = false;
 
-               private boolean demotionSystemActive = false;
+               private boolean demotionSystemActive = true;
                private boolean debugDemotion = false;
 
                // Strategy for entries in the expendable map
@@ -1321,9 +1321,9 @@ public abstract class World implements Dump.INode {
                                                        MessageUtil.info("[completeBinaryTypes=true] Completion of binary types activated"));
                                }
 
-                               s = p.getProperty(xsetTYPE_DEMOTION, "false");
-                               if (s.equalsIgnoreCase("true")) {
-                                       typeMap.demotionSystemActive = true;
+                               s = p.getProperty(xsetTYPE_DEMOTION, "true"); // default is ON
+                               if (s.equalsIgnoreCase("false")) {
+                                       typeMap.demotionSystemActive = false;
                                }
 
                                s = p.getProperty(xsetOVERWEAVING, "false");