Merge "Add support for multiple choice case statements within one augument in config...

[controller.git] / opendaylight / usermanager / api / src / main / java / org / opendaylight / controller / usermanager / AuthenticatedUser.java

diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java
index 94200e66e077e440fe379711904ca5720dd130f4..809ca134f77cf4cb62e4517d152b0e8b9342f9cd 100644 (file)
--- a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java
+++ b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java
@@ -10,6 +10,7 @@ package org.opendaylight.controller.usermanager;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -47,7 +48,7 @@ public class AuthenticatedUser implements Serializable {
     }
 
     public List<String> getUserRoles() {
-        return userRoles;
+        return userRoles == null ? Collections.<String> emptyList() : new ArrayList<String>(userRoles);
     }
 
     public void addUserRole(String string) {