diff --git a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java
index 8fe43af4..ba82efcc 100644
--- a/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java
+++ b/accounting/src/main/java/de/srsoftware/umbrella/accounting/SqliteDb.java
@@ -124,13 +124,16 @@ public class SqliteDb extends BaseDb implements AccountDb {
db.setAutoCommit(false);
Query.delete().from(TABLE_TAGS_TRANSACTIONS).where(TRANSACTION_ID,equal(transaction.id())).execute(db);
Query.delete().from(TABLE_TRANSACTIONS).where(ID,equal(transaction.id())).execute(db);
- db.setAutoCommit(true);
return transaction;
} catch (SQLException e){
try {
db.rollback();
} catch (SQLException ignored){};
throw failedToDropObject(transaction);
+ } finally {
+ try {
+ db.setAutoCommit(true);
+ } catch (SQLException ignored){};
}
}
diff --git a/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java b/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java
index 70d27d0b..6044f4fb 100644
--- a/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java
+++ b/contact/src/main/java/de/srsoftware/umbrella/contact/SqliteDb.java
@@ -67,9 +67,16 @@ public class SqliteDb extends BaseDb implements ContactDb{
db.setAutoCommit(false);
Query.delete().from(TABLE_CONTACTS).where(ID,equal(contact.id())).execute(db);
Query.delete().from(TABLE_CONTACTS_USERS).where(CONTACT_ID,equal(contact.id())).execute(db);
- db.setAutoCommit(true);
} catch (SQLException e){
+ try {
+ db.rollback();
+ } catch (SQLException ignored){};
throw failedToDropObject(t(CONTACT_WITH_ID, ID,contact.id())).causedBy(e);
+ } finally {
+ try {
+ db.setAutoCommit(true);
+ } catch (SQLException ignored){};
+
}
}
diff --git a/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java b/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java
index 89a916d6..0f9049df 100644
--- a/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java
+++ b/core/src/main/java/de/srsoftware/umbrella/core/BaseDb.java
@@ -69,9 +69,15 @@ CREATE TABLE IF NOT EXISTS {0} ( {1} VARCHAR(255) PRIMARY KEY, {2} VARCHAR(255)
update(table).set(STATUS).where(STATUS,equal(20)).prepare(db).apply(40).execute();
update(table).set(STATUS).where(STATUS,equal(10)).prepare(db).apply(20).execute();
update(table).set(STATUS).where(STATUS,equal(0)).prepare(db).apply(10).execute();
- db.setAutoCommit(true);
} catch (SQLException e) {
+ try {
+ db.rollback();
+ } catch (SQLException ignored) {}
throw new RuntimeException(e);
+ } finally {
+ try {
+ db.setAutoCommit(true);
+ } catch (SQLException ignored){};
}
}
}
diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java b/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java
index 6bfaa2cf..fd640979 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/SqliteDb.java
@@ -198,11 +198,17 @@ CREATE TABLE IF NOT EXISTS {0} (
rs.close();
delete().from(TABLE_POSITIONS).where(DOCUMENT_ID,equal(docId)).execute(db);
delete().from(TABLE_DOCUMENTS).where(ID,equal(docId)).execute(db);
- db.setAutoCommit(true);
if (number != null) return number;
throw failedToDropObject(t(DOCUMENT_WITH_ID, ID,docId));
} catch (SQLException e){
+ try {
+ db.rollback();
+ } catch (SQLException ignored){};
throw failedToDropObject(t(DOCUMENT_WITH_ID, ID,docId)).causedBy(e);
+ } finally {
+ try {
+ db.setAutoCommit(true);
+ } catch (SQLException ignored){};
}
}
@@ -217,10 +223,16 @@ CREATE TABLE IF NOT EXISTS {0} (
stmt.setLong(2,pos);
stmt.execute();
stmt.close();
- db.setAutoCommit(true);
return pos;
} catch (SQLException e) {
+ try {
+ db.rollback();
+ } catch (SQLException ignored){};
throw failedToDropObjectFromObject(POSITION,pos,t(Text.DOCUMENT),docId).causedBy(e);
+ } finally {
+ try {
+ db.setAutoCommit(true);
+ } catch (SQLException ignored){};
}
}
@@ -582,9 +594,15 @@ CREATE TABLE IF NOT EXISTS {0} (
update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(pair.left())).prepare(db).apply(-pair.right()).close();
update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(pair.right())).prepare(db).apply(pair.left()).close();
update(TABLE_POSITIONS).set(POS).where(DOCUMENT_ID,equal(docId)).where(POS,equal(-pair.right())).prepare(db).apply(pair.right()).close();
- db.setAutoCommit(true);
} catch (SQLException e) {
+ try {
+ db.rollback();
+ } catch (SQLException ignored){};
throw databaseException(FAILED_TO_SWITCH_POSITIONS,"a",pair.left(),"b",pair.right(),docId).causedBy(e);
+ } finally {
+ try {
+ db.setAutoCommit(true);
+ } catch (SQLException ignored){};
}
return pair;
}
diff --git a/frontend/src/routes/document/Position.svelte b/frontend/src/routes/document/Position.svelte
index e746422f..b195b0e3 100644
--- a/frontend/src/routes/document/Position.svelte
+++ b/frontend/src/routes/document/Position.svelte
@@ -1,6 +1,7 @@