svn commit: r1405869 - in /cxf/branches/2.6.x-fixes: ./ rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java

[sergeyb]

Author: sergeyb
Date: Mon Nov  5 16:39:40 2012
New Revision: 1405869

URL: http://svn.apache.org/viewvc?rev=1405869&view=rev
Log:
Merged revisions 1405868 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1405868 | sergeyb | 2012-11-05 16:34:07 +0000 (Mon, 05 Nov 2012) | 1 line
  
  [CXF-4614] Updating UserSubject to use LinkedList instead of 
Collections.emptyList to avoid JAXB-related issues
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1405868

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java?rev=1405869&r1=1405868&r2=1405869&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
 Mon Nov  5 16:39:40 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.cxf.rs.security.oauth2.common;
 
-import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlRootElement;
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlRoot
 public class UserSubject {
     
     private String login;
-    private List<String> roles = Collections.emptyList();
+    private List<String> roles = new LinkedList<String>();
     
     public UserSubject() {