Author: ito
Date: Wed Jun 15 06:18:27 2011
New Revision: 1135928
URL: http://svn.apache.org/viewvc?rev=1135928&view=rev
Log:
CLEREZZA-557: refactored UnionMGraph lock method because of potential deadlock
Modified:
incubator/clerezza/trunk/parent/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/UnionMGraph.java
Modified:
incubator/clerezza/trunk/parent/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/UnionMGraph.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/UnionMGraph.java?rev=1135928&r1=1135927&r2=1135928&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/UnionMGraph.java
(original)
+++
incubator/clerezza/trunk/parent/rdf.utils/src/main/java/org/apache/clerezza/rdf/utils/UnionMGraph.java
Wed Jun 15 06:18:27 2011
@@ -233,9 +233,14 @@ public class UnionMGraph extends Abstrac
@Override
public void lock() {
- for(Lock lock : locks) {
- lock.lock();
- }
+ boolean isLocked = false;
+ while(!isLocked) {
+ try {
+ isLocked = tryLock(10000,
TimeUnit.NANOSECONDS);
+ } catch (InterruptedException ex) {
+
+ }
+ }
}
@Override
