hostsharing/hs.hsadmin.ng
6
0
Fork 0
Code Pull Requests 2 Activity

bugfix/only-one-partner-per-person #143

Merged
hsh-michaelhoennig merged 5 commits from bugfix/only-one-partner-per-person into master 2025-01-07 09:30:40 +01:00
Conversation 1 Commits 5 Files Changed 14 +11 -12
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ec56369019 - Show all commits

23
src/test/java/net/hostsharing/hsadminng/hs/migration/CsvDataImport.java
View File

@ -170,19 +170,18 @@ public class CsvDataImport extends ContextBasedTest {
} }
public <T extends BaseEntity> T persistViaEM(final Integer id, final T entity) { public <T extends BaseEntity> T persistViaEM(final Integer id, final T entity) {
//System.out.println("persisting #" + entity.hashCode() + ": " + entity); if (em.contains(entity)) {
if (!em.contains(entity)) { return entity;
em.persist(entity); }
try {
em.persist(entity);
em.flush(); // makes it a bit slower, but produces better error messages
System.out.println("persisted #" + id + " as " + entity.getUuid());
return entity;
} catch (final Exception exc) {
System.err.println("persist failed for #" + id + " as " + entity);
throw exc; // for breakpoints
} }
// uncomment for debugging purposes
// try {
// em.flush(); // makes it slow, but produces better error messages
// System.out.println("persisted #" + entity.hashCode() + " as " + entity.getUuid());
// return entity;
// } catch (final Exception exc) {
// throw exc; // for breakpoints
// }
return entity;
} }
@SneakyThrows @SneakyThrows