Repository: phoenix Updated Branches: refs/heads/3.0 05b1ff4c6 -> ab785b401
PHOENIX-1131 Fix NPE in PhoenixRuntime.encodePk padding of row key values to max column length Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ab785b40 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ab785b40 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ab785b40 Branch: refs/heads/3.0 Commit: ab785b40122a8b8874dfebfd088be0b52e63b645 Parents: 05b1ff4 Author: James Taylor <[email protected]> Authored: Tue Jul 29 23:52:07 2014 -0700 Committer: James Taylor <[email protected]> Committed: Tue Jul 29 23:57:31 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/schema/PDataType.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ab785b40/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java index bf0ba08..c2fcbf0 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java @@ -180,7 +180,7 @@ public enum PDataType { */ CHAR("CHAR", Types.CHAR, String.class, null) { // Delegate to VARCHAR @Override - public Object pad(Object object, int maxLength) { + public Object pad(Object object, Integer maxLength) { String s = (String) object; if (s == null) { return s; @@ -3124,7 +3124,7 @@ public enum PDataType { }, BINARY("BINARY", Types.BINARY, byte[].class, null) { @Override - public Object pad(Object object, int maxLength) { + public Object pad(Object object, Integer maxLength) { byte[] b = (byte[]) object; if (b == null) { return null; @@ -7132,7 +7132,7 @@ public enum PDataType { throw new UnsupportedOperationException("Operation not supported for type " + this); } - public Object pad(Object object, int maxLength) { + public Object pad(Object object, Integer maxLength) { return object; }
