You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/19 04:23:01 UTC

git commit: PHOENIX-875: NPE when running end2end tests against a live cluster

Repository: incubator-phoenix
Updated Branches:
  refs/heads/master 675852ba9 -> 8fb959981


PHOENIX-875: NPE when running end2end tests against a live cluster


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/8fb95998
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/8fb95998
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/8fb95998

Branch: refs/heads/master
Commit: 8fb95998121d4f6e0330912ea5244dd9a8877045
Parents: 675852b
Author: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Authored: Tue Mar 18 20:24:10 2014 -0700
Committer: Jeffrey Zhong <jz...@JZhongs-MacBook-Pro.local>
Committed: Tue Mar 18 20:24:10 2014 -0700

----------------------------------------------------------------------
 .../java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/8fb95998/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index ebaafa8..55c293b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -984,7 +984,7 @@ public class MetaDataEndpointImpl extends MetaDataProtocol implements Coprocesso
                 }
             } else {
                 return new MetaDataMutationResult(MutationCode.NEWER_TABLE_FOUND,
-                        EnvironmentEdgeManager.currentTimeMillis(), table);
+                        EnvironmentEdgeManager.currentTimeMillis(), null);
             }
         }
         if (table == null && buildDeletedTable(key, cacheKey, region, clientTimeStamp) != null) {