You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2016/12/21 15:47:13 UTC
[3/3] cxf-fediz git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/9908207f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/9908207f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/9908207f
Branch: refs/heads/1.2.x-fixes
Commit: 9908207f2fd11cce5247098980cdc986a9797b5f
Parents: 5faa900
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed Dec 21 15:47:04 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Dec 21 15:47:04 2016 +0000
----------------------------------------------------------------------
.../apache/cxf/fediz/core/federation/FederationLogoutTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/9908207f/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationLogoutTest.java
----------------------------------------------------------------------
diff --git a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationLogoutTest.java b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationLogoutTest.java
index ee6775e..36a6d96 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationLogoutTest.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/FederationLogoutTest.java
@@ -266,7 +266,7 @@ public class FederationLogoutTest {
HttpServletRequest req = EasyMock.createMock(HttpServletRequest.class);
EasyMock.expect(req.getParameter(FederationConstants.PARAM_ACTION))
- .andReturn(FederationConstants.ACTION_SIGNOUT).anyTimes();
+ .andReturn(FederationConstants.ACTION_SIGNOUT).anyTimes();
EasyMock.expect(req.getParameter(FederationConstants.PARAM_REPLY)).andReturn(REPLY_URL).anyTimes();
EasyMock.expect(req.getRequestURL()).andReturn(new StringBuffer("https://localhost/fedizhelloworld/secure"));
EasyMock.expect(req.getRequestURI()).andReturn("/secure");
@@ -355,4 +355,4 @@ public class FederationLogoutTest {
EasyMock.replay(resp);
logoutHandler.handleRequest(req, resp);
}
-}
\ No newline at end of file
+}