Merge 827ea21 into 484f286

orientechnologies · Jun 15, 2016 · a410664 · a410664
2 parents 484f286 + 827ea21
commit a410664
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,9 @@ os:
   - linux
 jdk:
   - oraclejdk8
-sudo: required
-dist: trusty
+
+before_script:
+  - echo "MAVEN_OPTS='-Xmx3g'" > ~/.mavenrc
 
 install:
   - mvn install dependency:go-offline -Pskip-formatter -DskipTests=true -q -f driver/pom.xml -Dfailsafe.timeout=0

diff --git a/driver/pom.xml b/driver/pom.xml
@@ -12,7 +12,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <gremlin.version>3.2.0-incubating</gremlin.version>
-        <orientdb.version>2.1.15</orientdb.version>
+        <orientdb.version>2.2.2</orientdb.version>
     </properties>
 
     <developers>

diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraph.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraph.java
@@ -151,7 +151,7 @@ public void makeActive() {
                     this.pool.reCreatePool();
                     this.database = this.pool.acquire();
                 } else {
-                    ODatabaseDocumentTx replaceDb = new ODatabaseDocumentTx(this.database.getURL(), this.database.isKeepStorageOpen());
+                    ODatabaseDocumentTx replaceDb = new ODatabaseDocumentTx(this.database.getURL());
                     replaceDb.open(user, password);
                     this.database = replaceDb;
                 }
@@ -502,7 +502,7 @@ public void close() throws Exception {
             throw e;
         } catch (Exception e) {
             OLogManager.instance().error(this, "Error during context close for db " + url, e);
-            throw new OException("Error during context close for db " + url, e);
+            throw new RuntimeException("Error during context close for db " + url, e);
         } finally {
             try {
                 database.close();

diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphFactory.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphFactory.java
@@ -1,13 +1,13 @@
 package org.apache.tinkerpop.gremlin.orientdb;
 
-import com.orientechnologies.orient.core.db.ODatabaseFactory;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.exception.ODatabaseException;
 import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.structure.Graph;
 
 public final class OrientGraphFactory {
     public static String ADMIN = "admin";
@@ -120,7 +120,7 @@ protected Configuration getConfiguration(boolean create, boolean open, boolean t
      *            if true automatically opens the database
      */
     protected ODatabaseDocumentTx getDatabase(boolean create, boolean open) {
-        final ODatabaseDocumentTx db = new ODatabaseFactory().createDatabase("graph", url);
+        final ODatabaseDocumentTx db = new ODatabaseDocumentTx(url);
         if (!db.getURL().startsWith("remote:") && !db.exists()) {
             if (create)
                 db.create();

diff --git a/tests-scala/build.sbt b/tests-scala/build.sbt
@@ -2,7 +2,7 @@ name := "orientdb-tp3-test"
 organization := "com.michaelpollmeier"
 version := "1.0.0-SNAPSHOT"
 scalaVersion := "2.11.7"
-val orientDBVersion = "2.1.15"
+val orientDBVersion = "2.2.0"
 
 fork := true // if OrientDb version > 2.1-RC5