made sure that in case of concurrent modification exception on graph shutdown keep the thread local clean
@@ -1169,6 +1169,8 @@ public abstract class OrientBaseGraph extends OrientConfigurableGraph implements
}
}
+ } catch (ONeedRetryException e) {
+ throw e;
} catch (RuntimeException e) {
OLogManager.instance().error(this, "Error during context close for db " + url, e);
throw e;
@@ -1183,6 +1185,7 @@ public abstract class OrientBaseGraph extends OrientConfigurableGraph implements
database = null;
}
}
+ pollGraphFromStack(closeDb);
} catch (Exception e) {
OLogManager.instance().error(this, "Error during context close for db " + url, e);
}
@@ -1192,8 +1195,6 @@ public abstract class OrientBaseGraph extends OrientConfigurableGraph implements
username = null;
password = null;
- pollGraphFromStack(closeDb);
-
if (!closeDb)
getDatabase().activateOnCurrentThread();
}
