Author: j16sdiz
Date: 2009-01-05 12:03:17 +0000 (Mon, 05 Jan 2009)
New Revision: 24910
Modified:
trunk/plugins/XMLSpider/org/garret/perst/impl/StorageImpl.java
Log:
backported from (pre-release) perst 405, fix deadlock on rollback
Modified: trunk/plugins/XMLSpider/org/garret/perst/impl/StorageImpl.java
===================================================================
--- trunk/plugins/XMLSpider/org/garret/perst/impl/StorageImpl.java
2009-01-04 14:17:14 UTC (rev 24909)
+++ trunk/plugins/XMLSpider/org/garret/perst/impl/StorageImpl.java
2009-01-05 12:03:17 UTC (rev 24910)
@@ -1345,11 +1345,13 @@
throw new StorageError(StorageError.STORAGE_NOT_OPENED);
}
objectCache.invalidate();
+ synchronized (objectCache){
if (!modified) {
return;
}
rollback0();
modified = false;
+ }
}
private final void rollback0() {
@@ -2517,6 +2519,7 @@
freeId(oid);
}
obj.invalidate();
+ objectCache.clearDirty(obj);
}
}
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
