Remove unneeded synchronization

dgomezferro · May 29, 2012 · 1ac32f4 · 1ac32f4
1 parent bcd0f9b
commit 1ac32f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/yahoo/omid/tso/TSOState.java b/src/main/java/com/yahoo/omid/tso/TSOState.java
@@ -125,7 +125,7 @@ protected TimestampOracle getSO(){
     * 
     * @param startTimestamp
     */
-   protected synchronized void processCommit(long startTimestamp, long commitTimestamp){
+   protected void processCommit(long startTimestamp, long commitTimestamp){
        largestDeletedTimestamp = hashmap.setCommitted(startTimestamp, commitTimestamp, largestDeletedTimestamp);
    }
 

diff --git a/src/main/java/com/yahoo/omid/tso/persistence/LoggerProtocol.java b/src/main/java/com/yahoo/omid/tso/persistence/LoggerProtocol.java
@@ -61,7 +61,7 @@ public class LoggerProtocol extends TSOState{
      * Execute a logged entry (several logged ops)
      * @param bb Serialized operations
      */
-    synchronized void execute(ByteBuffer bb){
+    void execute(ByteBuffer bb){
         boolean done = !bb.hasRemaining();
         while(!done){
             byte op = bb.get();
@@ -123,7 +123,7 @@ synchronized void execute(ByteBuffer bb){
      * 
      * @return true if the recovery has finished
      */
-    synchronized boolean finishedRecovery() {
+    boolean finishedRecovery() {
         return (oracle && commits && aborts) || consumed;        
     }
 

diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
@@ -1,4 +1,4 @@
-log4j.rootLogger=TRACE,console
+log4j.rootLogger=INFO,console
 
 # Logging Threshold
 log4j.threshhold=ALL