Possible fix for #210

ocpsoft · May 28, 2015 · 9ad4fb9 · 9ad4fb9
1 parent 2305b96
commit 9ad4fb9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java b/api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java
@@ -23,7 +23,6 @@
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ocpsoft.rewrite.Root;
@@ -81,7 +80,6 @@ public void testI18nSupportWithAccent() throws Exception
    }
 
    @Test
-   @Ignore
    public void testI18nSupportOutbound() throws Exception
    {
       HttpAction<HttpGet> action = get("/en/search.xhtml");

diff --git a/config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/Join.java b/config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/Join.java
@@ -164,7 +164,7 @@ public Join to(final String resource)
          this.outboundConditionCache = resourcePath;
          for (String name : parameters) {
             Query parameter = Query.parameterExists(name);
-            outboundConditionCache = outboundConditionCache.and(parameter);
+            outboundConditionCache = parameter.and(outboundConditionCache);
          }
       }