Contexts must actually clear their underlying map.

api/src/main/java/org/ocpsoft/rewrite/config/RuleBuilder.java

@@ -292,6 +292,16 @@ public void call(Parameterized parameterized)
                   + "] and cannot be configured.");
    }
 
+   @Override
+   public void clear()
+   {
+      if (wrapped instanceof Context)
+      {
+         ((Context) wrapped).clear();;
+      }
+      contextMap.clear();;
+   }
+
    @Override
    public Object get(Object key)
    {

api/src/main/java/org/ocpsoft/rewrite/config/Subset.java

@@ -207,10 +207,12 @@ public String toString()
       /**
        * Clears the state of this context so that it may be reused, saving instantiation cost during rule iteration.
        */
+      @Override
       public void clear()
       {
          this.postOperations.clear();
          this.postOperations.clear();
+         super.clear();
       }
 
       @Override

api/src/main/java/org/ocpsoft/rewrite/context/Context.java

@@ -22,6 +22,11 @@
  */
 public interface Context
 {
+   /**
+    * Clear the contents of this context and reset to a "like-new" state.
+    */
+   void clear();
+
    /**
     * Get the value in the context map defined by the given key. Return <code>null</code> if no such key exists, or if
     * they key maps to a <code>null</code> value.

api/src/main/java/org/ocpsoft/rewrite/context/ContextBase.java

@@ -29,6 +29,12 @@ public abstract class ContextBase implements Context
 
    private final Map<Object, Object> map = new LinkedHashMap<Object, Object>();
 
+   @Override
+   public void clear()
+   {
+      map.clear();
+   }
+
    @Override
    public Object get(final Object key)
    {

api/src/test/java/org/ocpsoft/rewrite/config/RuleBuilderTest.java

@@ -30,6 +30,10 @@ public class RuleBuilderTest
 {
    private final EvaluationContext context = new EvaluationContext() {
 
+      @Override
+      public void clear()
+      {}
+
       @Override
       public void put(Object key, Object value)
       {}

impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/EvaluationContextImpl.java

@@ -78,11 +78,13 @@ public String toString()
    /**
     * Clears the state of this context so that it may be reused, saving instantiation cost during rule iteration.
     */
+   @Override
    public void clear()
    {
       this.postOperations.clear();
       this.postOperations.clear();
       state = null;
+      super.clear();
    }
 
    @Override

impl-servlet/src/main/java/org/ocpsoft/rewrite/servlet/impl/HttpRewriteContextImpl.java

@@ -116,4 +116,10 @@ public boolean containsKey(final Object key)
       return map.containsKey(key);
    }
 
+   @Override
+   public void clear()
+   {
+      map.clear();
+   }
+
 }