Merge branch 'master' of dev.insomnia.fi:/data/bortal

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/VotingBean.java

@@ -57,14 +57,11 @@ public class VotingBean implements VotingBeanLocal {
     	compoEntry.setCreated(Calendar.getInstance());
     	compoEntry.setCreated(Calendar.getInstance());
     	compoEntry.setCreator(permissionBean.getCurrentUser());
     	compoEntry.setCreator(permissionBean.getCurrentUser());
     	
     	
-    	compoEntryFacade.create(compoEntry);
+    	Compo c = compoFacade.merge(compoEntry.getCompo());
     	
     	
+    	c.getCompoEntries().add(compoEntry);
+    	compoFacade.flush();
     	compoEntryFile.setEntriesId(compoEntry);
     	compoEntryFile.setEntriesId(compoEntry);
-    	compoEntryFacade.flush();
-    	compoEntryFileFacade.create(compoEntryFile);
-    	
-    	compoEntry.setCurrentFile(compoEntryFile);
-    	compoEntry.setFiles(new ArrayList<CompoEntryFile>());
     	compoEntry.getFiles().add(compoEntryFile);
     	compoEntry.getFiles().add(compoEntryFile);
     }
     }