Author: jbellis
Date: Sat Dec 17 04:51:50 2011
New Revision: 1215392
URL: http://svn.apache.org/viewvc?rev=1215392&view=rev
Log:
switch CounterContext from log4j to slf4j
patch by Peter Schuller; reviewed by jbellis for CASSANDRA-3603
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/context/CounterContext.java
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/context/CounterContext.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/context/CounterContext.java?rev=1215392&r1=1215391&r2=1215392&view=diff
==============================================================================
---
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/context/CounterContext.java
(original)
+++
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/context/CounterContext.java
Sat Dec 17 04:51:50 2011
@@ -19,15 +19,18 @@ package org.apache.cassandra.db.context;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.db.DBConstants;
+import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.utils.Allocator;
-import org.apache.cassandra.utils.HeapAllocator;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.HeapAllocator;
import org.apache.cassandra.utils.NodeId;
/**
@@ -69,7 +72,7 @@ public class CounterContext implements I
private static final int COUNT_LENGTH = DBConstants.longSize;
private static final int STEP_LENGTH = NodeId.LENGTH + CLOCK_LENGTH +
COUNT_LENGTH;
- private static final Logger logger =
Logger.getLogger(CounterContext.class);
+ private static final Logger logger =
LoggerFactory.getLogger(CounterContext.class);
// lazy-load singleton
private static class LazyHolder