You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2011/02/11 22:46:57 UTC
svn commit: r1069962 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
Author: sergeyb
Date: Fri Feb 11 21:46:56 2011
New Revision: 1069962
URL: http://svn.apache.org/viewvc?rev=1069962&view=rev
Log:
Merged revisions 1069138 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1069138 | sergeyb | 2011-02-09 22:10:49 +0000 (Wed, 09 Feb 2011) | 1 line
[CXF-3322] Fixing build failure
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 11 21:46:56 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069249,1069318,1069492,1069500,1069716,1069720,1069814
+/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069130,1069138,1069249,1069318,1069492,1069500,1069716,1069720,1069814
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java?rev=1069962&r1=1069961&r2=1069962&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java Fri Feb 11 21:46:56 2011
@@ -92,12 +92,11 @@ public class DefaultSecurityContext impl
return false;
}
- @Override
+
public Subject getSubject() {
return subject;
}
- @Override
public Set<Principal> getUserRoles() {
Set<Principal> roles = new HashSet<Principal>();
if (subject != null) {