You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/02/02 06:37:31 UTC
git commit: don't use commons-lang and commons-lang3 at the same
time->3
Updated Branches:
refs/heads/trunk 6643dbdb1 -> 8085e6df2
don't use commons-lang and commons-lang3 at the same time->3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8085e6df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8085e6df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8085e6df
Branch: refs/heads/trunk
Commit: 8085e6df2311a64e3284952e9514b06d4dabfe56
Parents: 6643dbd
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Feb 2 00:37:10 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Feb 2 00:37:10 2014 -0500
----------------------------------------------------------------------
.../cassandra/hadoop/cql3/IterableCqlPagingRecordReader.java | 8 +++-----
src/java/org/apache/cassandra/utils/ByteBufferUtil.java | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8085e6df/src/java/org/apache/cassandra/hadoop/cql3/IterableCqlPagingRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/IterableCqlPagingRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/IterableCqlPagingRecordReader.java
index 85beed9..d7348b0 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/IterableCqlPagingRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/IterableCqlPagingRecordReader.java
@@ -23,8 +23,6 @@ import java.nio.ByteBuffer;
import java.util.Iterator;
import java.util.Map;
-import org.apache.commons.lang.NotImplementedException;
-
import org.apache.cassandra.utils.Pair;
/**
@@ -49,7 +47,7 @@ public class IterableCqlPagingRecordReader extends CqlPagingRecordReader
public void remove()
{
- throw new NotImplementedException("Cannot remove an element on this iterator!");
+ throw new UnsupportedOperationException("Cannot remove an element on this iterator!");
}
};
@@ -61,7 +59,7 @@ public class IterableCqlPagingRecordReader extends CqlPagingRecordReader
@Override
public boolean nextKeyValue() throws IOException
{
- throw new NotImplementedException("Calling method nextKeyValue() does not make sense in this implementation");
+ throw new UnsupportedOperationException("Calling method nextKeyValue() does not make sense in this implementation");
}
/**
@@ -70,6 +68,6 @@ public class IterableCqlPagingRecordReader extends CqlPagingRecordReader
@Override
public boolean next(Map<String, ByteBuffer> keys, Map<String, ByteBuffer> value) throws IOException
{
- throw new NotImplementedException("Calling method next() does not make sense in this implementation");
+ throw new UnsupportedOperationException("Calling method next() does not make sense in this implementation");
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8085e6df/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
index 491f1fb..20abaee 100644
--- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
+++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
@@ -190,7 +190,7 @@ public class ByteBufferUtil
}
/**
- * ByteBuffer adaptation of org.apache.commons.lang.ArrayUtils.lastIndexOf method
+ * ByteBuffer adaptation of org.apache.commons.lang3.ArrayUtils.lastIndexOf method
*
* @param buffer the array to traverse for looking for the object, may be <code>null</code>
* @param valueToFind the value to find