Skip to content

update to 2.0.13, db connection issue fixed #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkuger wants to merge 4 commits into
base: master
Choose a base branch
from
Open

update to 2.0.13, db connection issue fixed #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19b6573
upgrade orientdb library version from 2.0.1 to 2.0.9. The version 2.0.1
emmanuelsilva May 30, 2015
ffb4b26
fix for behavior, where sometimes a transaction begin on a closed con…
Aug 6, 2015
5fc414d
update to orient db version 2.0.13
Aug 6, 2015
7046586
eclipse plugin config removed.
Aug 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,39 @@ class OrientLocalTransaction implements LocalTransaction {

@Override
public void begin() throws ResourceException {
log.debug("begin()");
db.begin();
fireConnectionEvent(LOCAL_TRANSACTION_STARTED);
try {
log.debug("begin()");
if (db.isClosed()) {
log.debug("db connection closed, reopening...");
openDatabase();
}
db.begin();
fireConnectionEvent(LOCAL_TRANSACTION_STARTED);
} catch (RuntimeException e) {
throw new ResourceException(e);
}
}

@Override
public void commit() throws ResourceException {
log.debug("commit()");
db.commit();
fireConnectionEvent(LOCAL_TRANSACTION_COMMITTED);
try {
log.debug("commit()");
db.commit();
fireConnectionEvent(LOCAL_TRANSACTION_COMMITTED);
} catch (RuntimeException e) {
throw new ResourceException(e);
}
}

@Override
public void rollback() throws ResourceException {
log.debug("rollback()");
db.rollback();
fireConnectionEvent(LOCAL_TRANSACTION_ROLLEDBACK);
try {
log.debug("rollback()");
db.rollback();
fireConnectionEvent(LOCAL_TRANSACTION_ROLLEDBACK);
} catch (RuntimeException e) {
throw new ResourceException(e);
}
}
}

Expand Down Expand Up @@ -112,11 +128,11 @@ private void createDatabaseHandle() {

log.debug("instantiating Orient Database of type [{}] with URL [{}]", type, url);
if (type.equals("document")) {
this.db = new ODatabaseDocumentTx(url);
this.db = new ODatabaseDocumentTx(url, true);
} else if (type.equals("object")) {
this.db = new OObjectDatabaseTx(url);
} else if (type.equals("graph")) {
this.db = new ODatabaseDocumentTx(url);
this.db = new ODatabaseDocumentTx(url, true);
}
}

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<blueprints.version>2.6.0</blueprints.version>
<glassfish.version>4.1</glassfish.version>
<logback.version>1.0.4</logback.version>
<orientdb.version>2.0.1</orientdb.version>
<orientdb.version>2.0.13</orientdb.version>
<slf4j.version>1.6.6</slf4j.version>
<spring.version>4.1.4.RELEASE</spring.version>
<wildfly.version>8.2.0.Final</wildfly.version>
Expand Down