Changeset 81:3be57c18c693 in AnnotationManagerN4J for src

Timestamp:

Jul 23, 2014, 1:09:54 PM (10 years ago)

Author:

casties

Branch:

default

Message:

more fixing bugs with transactions thanks to neo4j 2 :-(

File:

• src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java (modified) (5 diffs)

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -314 +314 @@
     public List<Group> getGroupsForPersonNode(Node person) {
         ArrayList<Group> groups = new ArrayList<Group>();
-        Iterable<Relationship> rels = person.getRelationships(RelationTypes.MEMBER_OF);
-        for (Relationship rel : rels) {
-            Node groupNode = rel.getEndNode();
-            Actor group = createActorFromNode(groupNode);
-            // make sure we're getting a group
-            if (!(group instanceof Group)) {
-                logger.severe("target of MEMBER_OF is not GROUP! rel=" + rel);
-                continue;
-            }
-            groups.add((Group) group);
+        try (Transaction tx = graphDb.beginTx()) {
+                Iterable<Relationship> rels = person.getRelationships(RelationTypes.MEMBER_OF);
+                for (Relationship rel : rels) {
+                        Node groupNode = rel.getEndNode();
+                        Actor group = createActorFromNode(groupNode);
+                        // make sure we're getting a group
+                        if (!(group instanceof Group)) {
+                                logger.severe("target of MEMBER_OF is not GROUP! rel=" + rel);
+                                continue;
+                        }
+                        groups.add((Group) group);
+                }
+                tx.success();
         }
         return groups;
@@ -364 +367 @@
         ArrayList<Person> members = new ArrayList<Person>();
         Node gn = getActorNode(group);
-        Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
-        for (Relationship rel : rels) {
-            Node memberNode = rel.getStartNode();
-            Actor member = createActorFromNode(memberNode);
-            // make sure we're getting a group
-            if (!(member instanceof Person)) {
-                logger.severe("source of MEMBER_OF is not PERSON! rel=" + rel);
-                continue;
-            }
-            members.add((Person) member);
+        try (Transaction tx = graphDb.beginTx()) {
+                Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
+                for (Relationship rel : rels) {
+                        Node memberNode = rel.getStartNode();
+                        Actor member = createActorFromNode(memberNode);
+                        // make sure we're getting a group
+                        if (!(member instanceof Person)) {
+                                logger.severe("source of MEMBER_OF is not PERSON! rel=" + rel);
+                                continue;
+                        }
+                        members.add((Person) member);
+                }
+                tx.success();
         }
         return members;
@@ -404 +410 @@
         Node gn = getActorNode(group);
         Node pn = getActorNode(member);
-        Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
-        for (Relationship rel : rels) {
-            Node mn = rel.getStartNode();
-            if (mn.equals(pn)) {
-                try (Transaction tx = graphDb.beginTx()) {
+        try (Transaction tx = graphDb.beginTx()) {
+                Iterable<Relationship> rels = gn.getRelationships(RelationTypes.MEMBER_OF);
+                for (Relationship rel : rels) {
+                        Node mn = rel.getStartNode();
+                        if (mn.equals(pn)) {
                     rel.delete();
-                    tx.success();
                 }
                 // there should be only one
                 break;
             }
+            tx.success();
         }
     }
@@ -474 +480 @@
             idx = getNodeIndex(NodeTypes.PERSON);
         }
-        Node actorNode = idx.get("uri", uri).getSingle();
-        if (actorNode != null) {
-            // delete relations
-            try (Transaction tx = graphDb.beginTx()) {
-                for (Relationship rel : actorNode.getRelationships()) {
-                    rel.delete();
-                }
-                if (!actorNode.hasRelationship()) {
+        try (Transaction tx = graphDb.beginTx()) {
+                Node actorNode = idx.get("uri", uri).getSingle();
+                if (actorNode != null) {
+                        // delete relations
+                for (Relationship rel : actorNode.getRelationships()) {
+                        rel.delete();
+                }
+                if (!actorNode.hasRelationship()) {
                     // this shouldn't happen
                     deleteNode(actorNode);
@@ -487 +493 @@
                     logger.severe("deleteActor: unable to delete: Node still has relations.");
                 }
-                tx.success();
-            }
+            }
+            tx.success();
         }
     }