svn commit: r666260 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/util/Bytes.java

[st...@apache.org]

Author: stack
Date: Tue Jun 10 11:29:48 2008
New Revision: 666260

URL: http://svn.apache.org/viewvc?rev=666260&view=rev
Log:
HBASE-676 Bytes.getInt returns a long

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=666260&r1=666259&r2=666260&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jun 10 11:29:48 2008
@@ -46,6 +46,7 @@
    HBASE-665   Server side scanner doesn't honor stop row
    HBASE-662   UI in table.jsp gives META locations, not the table's regions
                location (Jean-Daniel Cryans via Stack)
+   HBASE-676   Bytes.getInt returns a long (Clint Morgan via Stack)
    
   IMPROVEMENTS
    HBASE-559   MR example job to count table rows

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java?rev=666260&r1=666259&r2=666260&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java Tue Jun 10 11:29:48 2008
@@ -133,9 +133,9 @@
    * @param bytes
    * @return the long value
    */
-  public static long toInt(byte[] bytes) {
+  public static int toInt(byte[] bytes) {
     if (bytes == null || bytes.length == 0) {
-      return -1L;
+      return -1;
     }
     return ByteBuffer.wrap(bytes).getInt();
   }
@@ -283,4 +283,4 @@
     result[0] = column;
     return result;
   }
-}
\ No newline at end of file
+}