Merge branch 'develop' of github.com:orientechnologies/orientdb into …

…develop
orientechnologies · Apr 27, 2015 · a033fa8 · a033fa8
2 parents fb39e6d + c61c830
commit a033fa8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...hnologies/orient/core/serialization/serializer/record/binary/ORecordSerializerBinary.java b/...hnologies/orient/core/serialization/serializer/record/binary/ORecordSerializerBinary.java
@@ -72,9 +72,9 @@ public ORecord fromStream(final byte[] iSource, ORecord iRecord, final String[]
         serializerByVersion[iSource[0]].deserializePartial((ODocument) iRecord, container, iFields);
       else
         serializerByVersion[iSource[0]].deserialize((ODocument) iRecord, container);
-    } catch (IndexOutOfBoundsException e) {
-      OLogManager.instance().warn(this, "Error deserializing record %s send this data for debugging",
-          OBase64Utils.encodeBytes(iSource));
+    } catch (RuntimeException e) {
+      OLogManager.instance().warn(this, "Error deserializing record with id %s send this data for debugging: %s ",
+          iRecord.getIdentity().toString(), OBase64Utils.encodeBytes(iSource));
       throw e;
     }
     return iRecord;

diff --git a/graphdb/src/main/java/com/orientechnologies/orient/graph/console/OInternalGraphImporter.java b/graphdb/src/main/java/com/orientechnologies/orient/graph/console/OInternalGraphImporter.java
@@ -6,6 +6,7 @@
 
 import com.orientechnologies.common.exception.OException;
 import com.orientechnologies.orient.client.db.ODatabaseHelper;
+import com.orientechnologies.orient.core.Orient;
 import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx;
 import com.orientechnologies.orient.core.sql.OCommandSQL;
 import com.tinkerpop.blueprints.impls.orient.OrientBaseGraph;
@@ -19,6 +20,8 @@ public static void main(final String[] args) throws Exception {
     String dbURL = args.length > 1 ? args[1] : null;
 
     new OInternalGraphImporter().runImport(inputFile, dbURL);
+    Orient.instance().shutdown();
+    System.exit(0);
   }
 
   public void runImport(String inputFile, String dbURL) throws IOException, FileNotFoundException {