also some incomingflow-fixes and one '2 changes at the same time' -fix

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

@@ -50,6 +50,10 @@ import fi.codecrew.moya.util.MailMessage;
 @DeclareRoles({ UserPermission.S_WRITE_ROLES })
 @DeclareRoles({ UserPermission.S_WRITE_ROLES })
 public class CardTemplateBean implements CardTemplateBeanLocal {
 public class CardTemplateBean implements CardTemplateBeanLocal {
 
 
+	
+	
+	
+	
 	private static final Logger logger = LoggerFactory.getLogger(CardTemplateBean.class);
 	private static final Logger logger = LoggerFactory.getLogger(CardTemplateBean.class);
 
 
 	/**
 	/**

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

@@ -261,7 +261,7 @@ public class NetworkAssociationBean implements NetworkAssociationBeanLocal {
 		}
 		}
 		
 		
 		// Finally persist the association and return
 		// Finally persist the association and return
-		na = networkAssociationFacade.create(na);
+		networkAssociationFacade.create(na);
 		return na;
 		return na;
 	}
 	}
 	
 	

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

@@ -173,10 +173,16 @@ public class ReaderBean implements ReaderBeanLocal {
 	@Override
 	@Override
 	public ReaderEvent assocCodeToCard(ReaderEvent readerEvent, PrintedCard card) {
 	public ReaderEvent assocCodeToCard(ReaderEvent readerEvent, PrintedCard card) {
 		
 		
-		CardCode code = new CardCode(card, readerEvent.getReader().getType(), readerEvent.getValue());
+		// you can select between this and flushCache.
+		card = cardfacade.reload(card);
+
+		CardCode code = new CardCode(card, readerEvent.getReader().getType(), readerEvent.getValue(),eventbean.getCurrentEvent());
 
 
 		cardCodeFacade.create(code);
 		cardCodeFacade.create(code);
 		
 		
+
+		card.getCardCodes().add(code);
+
 		return readerEvent;
 		return readerEvent;
 	}
 	}