svn commit: r1156872 - /incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java

[es...@apache.org]

Author: esammer
Date: Fri Aug 12 00:46:35 2011
New Revision: 1156872

URL: http://svn.apache.org/viewvc?rev=1156872&view=rev
Log:
- Made all CounterGroup methods synchronized.

Modified:
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java?rev=1156872&r1=1156871&r2=1156872&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/CounterGroup.java Fri Aug 12 00:46:35 2011
@@ -1,57 +1,55 @@
 package org.apache.flume.core;
 
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class CounterGroup {
 
   private String name;
-  private ConcurrentHashMap<String, AtomicLong> counters;
+  private HashMap<String, AtomicLong> counters;
 
   public CounterGroup() {
-    counters = new ConcurrentHashMap<String, AtomicLong>();
+    counters = new HashMap<String, AtomicLong>();
   }
 
-  public Long get(String name) {
+  public synchronized Long get(String name) {
     return getCounter(name).get();
   }
 
-  public Long incrementAndGet(String name) {
+  public synchronized Long incrementAndGet(String name) {
     return getCounter(name).incrementAndGet();
   }
 
-  public Long addAndGet(String name, Long delta) {
+  public synchronized Long addAndGet(String name, Long delta) {
     return getCounter(name).addAndGet(delta);
   }
 
-  public AtomicLong getCounter(String name) {
-    synchronized (counters) {
-      if (!counters.containsKey(name)) {
-        counters.put(name, new AtomicLong());
-      }
+  public synchronized AtomicLong getCounter(String name) {
+    if (!counters.containsKey(name)) {
+      counters.put(name, new AtomicLong());
     }
 
     return counters.get(name);
   }
 
   @Override
-  public String toString() {
+  public synchronized String toString() {
     return "{ name:" + name + " counters:" + counters + " }";
   }
 
-  public String getName() {
+  public synchronized String getName() {
     return name;
   }
 
-  public void setName(String name) {
+  public synchronized void setName(String name) {
     this.name = name;
   }
 
-  public ConcurrentHashMap<String, AtomicLong> getCounters() {
+  public synchronized HashMap<String, AtomicLong> getCounters() {
     return counters;
   }
 
-  public void setCounters(ConcurrentHashMap<String, AtomicLong> counters) {
+  public synchronized void setCounters(HashMap<String, AtomicLong> counters) {
     this.counters = counters;
   }