[richfaces-svn-commits] JBoss Rich Faces SVN: r14173 - trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager.

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

Author: amarkhel
Date: 2009-05-13 12:07:57 -0400 (Wed, 13 May 2009)
New Revision: 14173

Modified:
   trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java
Log:


Modified: trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java
===================================================================
--- trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java	2009-05-13 15:41:45 UTC (rev 14172)
+++ trunk/examples/photoalbum/source/web/src/main/java/org/richfaces/photoalbum/manager/Controller.java	2009-05-13 16:07:57 UTC (rev 14173)
@@ -315,7 +315,7 @@
 		Album alb = null;
 		//If selected album belongs to user
 		alb = setDefaultAlbumToUpload(alb);
-		model.resetModel(NavigationEnum.FILE_UPLOAD, user, alb.getShelf(), alb, null, alb.getImages());
+		model.resetModel(NavigationEnum.FILE_UPLOAD, user, alb != null ? alb.getShelf() : null, alb, null, alb != null ? alb.getImages() : null);
 	}
 	
 	/**