From 4cf431308f54270228d7817dd034151de57a8935 Mon Sep 17 00:00:00 2001 From: kamaci Date: Tue, 20 Nov 2018 09:38:11 +0300 Subject: [PATCH 1/2] Unlocked the lock along all execution paths of it. --- .../rdf/core/access/security/TcAccessController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java index 3f3551f0e..116f85f78 100644 --- a/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java +++ b/rdf/core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java @@ -148,8 +148,8 @@ public void setRequiredReadPermissionStrings(IRI GraphUri, readPermissionCache.remove(GraphUri); final Graph permissionMGraph = getOrCreatePermisionGraph(); Lock l = permissionMGraph.getLock().writeLock(); - l.lock(); try { + l.lock(); removeExistingRequiredReadPermissions(GraphUri, permissionMGraph); final BlankNodeOrIRI permissionList = createList(permissionDescriptions.iterator(), permissionMGraph); permissionMGraph.add(new TripleImpl(GraphUri, @@ -188,8 +188,8 @@ public void setRequiredReadWritePermissionStrings(IRI GraphUri, readWritePermissionCache.remove(GraphUri); final Graph permissionMGraph = getOrCreatePermisionGraph(); Lock l = permissionMGraph.getLock().writeLock(); - l.lock(); try { + l.lock(); removeExistingRequiredReadPermissions(GraphUri, permissionMGraph); final BlankNodeOrIRI permissionList = createList(permissionDescriptions.iterator(), permissionMGraph); permissionMGraph.add(new TripleImpl(GraphUri, @@ -308,8 +308,8 @@ private Collection getRequiredPermissionStrings(final IRI GraphUri, IRI try { final Graph permissionMGraph = tcManager.getMGraph(permissionGraphName); Lock l = permissionMGraph.getLock().readLock(); - l.lock(); try { + l.lock(); Triple t = permissionMGraph.filter(GraphUri, property, null).next(); BlankNodeOrIRI list = (BlankNodeOrIRI) t.getObject(); LinkedList result = new LinkedList(); From e51400d87f60fbebc5c1fb9fd6db7d2042110ebd Mon Sep 17 00:00:00 2001 From: kamaci Date: Tue, 20 Nov 2018 10:06:02 +0300 Subject: [PATCH 2/2] Iterator.next() method should throw NoSuchElementException. --- .../src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java index b052b010e..ce421448f 100644 --- a/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java +++ b/rdf/utils/src/main/java/org/apache/clerezza/rdf/utils/GraphNode.java @@ -209,7 +209,7 @@ private T prepareNext() { return (T) nextObject; } } - return null; + throw new NoSuchElementException(); } }; }