Merge

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/ReaderBean.java

@@ -156,10 +156,12 @@ public class ReaderBean implements ReaderBeanLocal {
 		// reader is in autoproduct-mode, create dat product
 		// reader is in autoproduct-mode, create dat product
 		if (reader.isAutoproduct()) {
 		if (reader.isAutoproduct()) {
 			EventUser eu = userbean.getEventUser(card.getUser().getUser());
 			EventUser eu = userbean.getEventUser(card.getUser().getUser());
-			AccountEvent createAc = productPBean.createAccountEvent(reader.getAutomaticProduct(), reader.getAutomaticProductCount(), eu, Calendar.getInstance());
-			readerfacade.flush();
-			logger.info("Creating new accountevent from autoproduct {}", createAc);
-			event.setNotes("Created automatic account event from reader. " + createAc);
+			if (eu != null) {
+				AccountEvent createAc = productPBean.createAccountEvent(reader.getAutomaticProduct(), reader.getAutomaticProductCount(), eu, Calendar.getInstance());
+				readerfacade.flush();
+				logger.info("Creating new accountevent from autoproduct {}", createAc);
+				event.setNotes("Created automatic account event from reader. " + createAc);
+			}
 		}
 		}
 
 
 		event = readerEventFacade.create(event);
 		event = readerEventFacade.create(event);

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -642,6 +642,7 @@ public class UserBean implements UserBeanLocal {
 		user = userFacade.find(user.getId());
 		user = userFacade.find(user.getId());
 
 
 		EventUser ret = eventUserFacade.find(user);
 		EventUser ret = eventUserFacade.find(user);
+
 		if (create && ret == null)
 		if (create && ret == null)
 		{
 		{
 			ret = new EventUser(user, eventBean.getCurrentEvent(), permbean.getCurrentUser());
 			ret = new EventUser(user, eventBean.getCurrentEvent(), permbean.getCurrentUser());
@@ -649,6 +650,7 @@ public class UserBean implements UserBeanLocal {
 			eventUserFacade.flush();
 			eventUserFacade.flush();
 			ret.setCreator(permbean.getCurrentUser());
 			ret.setCreator(permbean.getCurrentUser());
 		}
 		}
+
 		return ret;
 		return ret;
 	}
 	}