Index: src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1139682) +++ src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -1404,7 +1404,7 @@ actionsByServer.put(loc, actions); } - Action action = new Action(regionName, row, i); + Action action = new Action(row, i); lastServers[i] = loc; actions.add(regionName, action); } Index: src/main/java/org/apache/hadoop/hbase/client/Action.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/client/Action.java (revision 1140379) +++ src/main/java/org/apache/hadoop/hbase/client/Action.java (working copy) @@ -34,7 +34,6 @@ */ public class Action implements Writable, Comparable { - private byte[] regionName; private Row action; private int originalIndex; private R result; @@ -43,19 +42,27 @@ super(); } + /* + * This constructor is replaced by {@link #Action(Row, int)} + */ + @Deprecated public Action(byte[] regionName, Row action, int originalIndex) { + this(action, originalIndex); + } + + public Action(Row action, int originalIndex) { super(); - this.regionName = regionName; this.action = action; - this.originalIndex = originalIndex; + this.originalIndex = originalIndex; } - + + @Deprecated public byte[] getRegionName() { - return regionName; + return null; } + @Deprecated public void setRegionName(byte[] regionName) { - this.regionName = regionName; } public R getResult() { @@ -84,7 +91,6 @@ // /////////////////////////////////////////////////////////////////////////// public void write(final DataOutput out) throws IOException { - Bytes.writeByteArray(out, regionName); HbaseObjectWritable.writeObject(out, action, Row.class, null); out.writeInt(originalIndex); HbaseObjectWritable.writeObject(out, result, @@ -92,7 +98,6 @@ } public void readFields(final DataInput in) throws IOException { - this.regionName = Bytes.readByteArray(in); this.action = (Row) HbaseObjectWritable.readObject(in, null); this.originalIndex = in.readInt(); this.result = (R) HbaseObjectWritable.readObject(in, null);