phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject git commit: PHOENIX-875: NPE when running end2end tests against a live cluster
Date Wed, 19 Mar 2014 03:24:10 GMT
Repository: incubator-phoenix
Updated Branches:
  refs/heads/4.0 896888c56 -> ed3b3bb24


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/ed3b3bb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/ed3b3bb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/ed3b3bb2

Branch: refs/heads/4.0
Commit: ed3b3bb24f7fce6119b6d8475761cda818bc7811
Parents: 896888c
Author: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Authored: Tue Mar 18 20:24:10 2014 -0700
Committer: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Committed: Tue Mar 18 20:27:55 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/ed3b3bb2/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 09df3fb..5adf649 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
@@ -985,7 +985,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) {


Mime
View raw message