Squashed commit of the following:
commit e9604083c5374bf5eac889e82cf54bb0b22ef763
Author: Naoki Shiota <n-shiota@onlab.us>
Date: Wed Oct 23 11:51:00 2013 -0700
Refactored NetworkGraphPublisher and related modules to be ready for implementing event notification.
diff --git a/src/main/java/net/onrc/onos/graph/GraphDBConnection.java b/src/main/java/net/onrc/onos/graph/GraphDBConnection.java
index bebcdd2..56a54f2 100644
--- a/src/main/java/net/onrc/onos/graph/GraphDBConnection.java
+++ b/src/main/java/net/onrc/onos/graph/GraphDBConnection.java
@@ -7,6 +7,7 @@
import com.thinkaurelius.titan.core.TitanFactory;
import com.thinkaurelius.titan.core.TitanGraph;
+import com.thinkaurelius.titan.diskstorage.StorageException;
import com.tinkerpop.blueprints.TransactionalGraph;
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.util.wrappers.event.EventTransactionalGraph;
@@ -133,15 +134,17 @@
/**
* Commit changes for the graph operations.
+ * @throws Exception
*/
@Override
public void commit() {
- try {
+// // Should not catch exception here!
+// try {
graph.commit();
- }
- catch (Exception e) {
- log.error("{}", e.toString());
- }
+// }
+// catch (Exception e) {
+// log.error("{}", e.toString());
+// }
}
/**
@@ -149,12 +152,13 @@
*/
@Override
public void rollback() {
- try {
+ // Should not catch exception here!
+// try {
graph.rollback();
- }
- catch (Exception e) {
- log.error("{}", e.toString());
- }
+// }
+// catch (Exception e) {
+// log.error("{}", e.toString());
+// }
}
/**
@@ -162,6 +166,10 @@
*/
@Override
public void close() {
- commit();
+ try {
+ commit();
+ } catch (Exception e) {
+ log.error("{}", e.toString());
+ }
}
}