directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-105 - [fortress-core] - fix npe with jpegphoto
Date Mon, 18 May 2015 19:44:42 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master d063797fb -> 2e5a93cb8


FC-105 - [fortress-core] - fix npe with jpegphoto


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/2e5a93cb
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/2e5a93cb
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/2e5a93cb

Branch: refs/heads/master
Commit: 2e5a93cb8e7319309d492922eb0eeec2206e454d
Parents: d063797
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon May 18 14:44:30 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon May 18 14:44:30 2015 -0500

----------------------------------------------------------------------
 src/main/java/org/apache/directory/fortress/core/rbac/User.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/2e5a93cb/src/main/java/org/apache/directory/fortress/core/rbac/User.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rbac/User.java b/src/main/java/org/apache/directory/fortress/core/rbac/User.java
index 6ee2798..464c01d 100755
--- a/src/main/java/org/apache/directory/fortress/core/rbac/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/rbac/User.java
@@ -1562,7 +1562,8 @@ public class User extends FortEntity implements Constraint, Serializable
      */
     public void setJpegPhoto( byte[] jpegPhoto )
     {
-        this.jpegPhoto = jpegPhoto.clone();
+        if( jpegPhoto != null )
+            this.jpegPhoto = jpegPhoto.clone();
     }
 
 


Mime
View raw message