You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2010/07/27 00:27:11 UTC
svn commit: r979474 - in /hadoop/zookeeper/branches/branch-3.3: CHANGES.txt
src/java/main/org/apache/zookeeper/server/ZKDatabase.java
Author: mahadev
Date: Mon Jul 26 22:27:11 2010
New Revision: 979474
URL: http://svn.apache.org/viewvc?rev=979474&view=rev
Log:
ZOOKEEPER-783. committedLog in ZKDatabase is not properly synchronized (henry via mahadev)
Modified:
hadoop/zookeeper/branches/branch-3.3/CHANGES.txt
hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZKDatabase.java
Modified: hadoop/zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/CHANGES.txt?rev=979474&r1=979473&r2=979474&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ hadoop/zookeeper/branches/branch-3.3/CHANGES.txt Mon Jul 26 22:27:11 2010
@@ -3,6 +3,8 @@ Branch 3.3
Backward compatible changes:
BUGFIXES:
+ ZOOKEEPER-783. committedLog in ZKDatabase is not properly synchronized
+ (henry via mahadev)
IMPROVEMENTS:
Modified: hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZKDatabase.java
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZKDatabase.java?rev=979474&r1=979473&r2=979474&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZKDatabase.java (original)
+++ hadoop/zookeeper/branches/branch-3.3/src/java/main/org/apache/zookeeper/server/ZKDatabase.java Mon Jul 26 22:27:11 2010
@@ -104,7 +104,9 @@ public class ZKDatabase {
*/
dataTree = new DataTree();
sessionsWithTimeouts.clear();
- committedLog.clear();
+ synchronized (committedLog) {
+ committedLog.clear();
+ }
initialized = false;
}
@@ -136,7 +138,9 @@ public class ZKDatabase {
}
public LinkedList<Proposal> getCommittedLog() {
- return this.committedLog;
+ synchronized (this.committedLog) {
+ return new LinkedList<Proposal>(this.committedLog);
+ }
}
/**