[richfaces-svn-commits] JBoss Rich Faces SVN: r13900 - trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain.

[richfaces-svn-commits at lists.jboss.org]

Author: amarkhel
Date: 2009-04-29 08:36:06 -0400 (Wed, 29 Apr 2009)
New Revision: 13900

Modified:
   trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java
   trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java
Log:


Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java
===================================================================
--- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java	2009-04-29 12:36:01 UTC (rev 13899)
+++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Album.java	2009-04-29 12:36:06 UTC (rev 13900)
@@ -215,7 +215,7 @@
 	 * @return User object, owner of this album
 	 */
 	public User getOwner() {
-		return getShelf().getOwner();
+		return getShelf() != null ?  getShelf().getOwner() : null ;
 	}
 
 	public boolean isOwner(User user) {

Modified: trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java
===================================================================
--- trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java	2009-04-29 12:36:01 UTC (rev 13899)
+++ trunk/examples/photoalbum/source/ejb/src/main/java/org/richfaces/photoalbum/domain/Shelf.java	2009-04-29 12:36:06 UTC (rev 13900)
@@ -106,7 +106,7 @@
 	}
 
 	public boolean isOwner(User user) {
-		return getOwner().equals(user);
+		return getOwner() != null && getOwner().equals(user);
 	}
 
 	public Date getCreated() {