Merge "Backward compatibility for User management"

diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java
index ea9e599d83c06ef9af96493935f7ebe53081ef97..958b15978cf648114597047198c07375a7133802 100644 (file)
--- a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java
+++ b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/UserConfig.java
@@ -137,7 +137,7 @@ public class UserConfig extends ConfigurationObject implements Serializable {
     }
 
     public byte[] getSalt() {
-        return salt.clone();
+        return (salt == null) ? null : salt.clone();
     }
 
     @Override