Skip to content

Commit ab6006a

Browse files
committed
Possible fix for #210
1 parent 20c22c4 commit ab6006a

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

api-tests/src/test/java/org/ocpsoft/rewrite/transposition/LocaleTranspositionTest.java

-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.jboss.shrinkwrap.api.asset.StringAsset;
2424
import org.jboss.shrinkwrap.api.spec.WebArchive;
2525
import org.junit.Assert;
26-
import org.junit.Ignore;
2726
import org.junit.Test;
2827
import org.junit.runner.RunWith;
2928
import org.ocpsoft.rewrite.Root;
@@ -81,7 +80,6 @@ public void testI18nSupportWithAccent() throws Exception
8180
}
8281

8382
@Test
84-
@Ignore
8583
public void testI18nSupportOutbound() throws Exception
8684
{
8785
HttpAction<HttpGet> action = get("/en/search.xhtml");

config-servlet/src/main/java/org/ocpsoft/rewrite/servlet/config/rule/Join.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public Join to(final String resource)
164164
this.outboundConditionCache = resourcePath;
165165
for (String name : parameters) {
166166
Query parameter = Query.parameterExists(name);
167-
outboundConditionCache = outboundConditionCache.and(parameter);
167+
outboundConditionCache = parameter.and(outboundConditionCache);
168168
}
169169
}
170170

0 commit comments

Comments
 (0)