You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/09 04:05:01 UTC
[1/4] git commit: Revert "ACCUMULO-2125 - bumping up guava"
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 5d573050b -> a55ee6ebc
refs/heads/master 0c92a63f9 -> 9b5475314
Revert "ACCUMULO-2125 - bumping up guava"
reverting until classpath issues in MAC are resolved
This reverts commit 1a9ae3cccf9e390ed6a6019a38fb3ee30965572a.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d573050
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d573050
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d573050
Branch: refs/heads/master
Commit: 5d573050b265fe99f4ee8c9bf5acaf1c3f6c685d
Parents: 5bd4e27
Author: John Vines <vi...@apache.org>
Authored: Wed Jan 8 18:41:29 2014 -0500
Committer: John Vines <vi...@apache.org>
Committed: Wed Jan 8 18:41:40 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d573050/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f620e8e..75be8d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>15.0</version>
+ <version>14.0.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
[2/4] git commit: ACCUMULO--2134 Catch the case where we get the TNFE
wrapped in an AccumuloException
Posted by el...@apache.org.
ACCUMULO--2134 Catch the case where we get the TNFE wrapped in an AccumuloException
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55ee6eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55ee6eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a55ee6eb
Branch: refs/heads/master
Commit: a55ee6ebc0bb807db400c0c1626823b80374d106
Parents: 5d57305
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 8 22:03:29 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 8 22:03:29 2014 -0500
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a55ee6eb/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 3413c94..de7ca80 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -226,6 +226,10 @@ public class ProxyServer implements AccumuloProxy.Iface {
try {
throw ex;
} catch (AccumuloException e) {
+ Throwable cause = e.getCause();
+ if (null != cause && TableNotFoundException.class.equals(cause.getClass())) {
+ throw new org.apache.accumulo.proxy.thrift.TableNotFoundException(cause.toString());
+ }
handleAccumuloException(e);
} catch (AccumuloSecurityException e) {
handleAccumuloSecurityException(e);
[3/4] git commit: ACCUMULO--2134 Catch the case where we get the TNFE
wrapped in an AccumuloException
Posted by el...@apache.org.
ACCUMULO--2134 Catch the case where we get the TNFE wrapped in an AccumuloException
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a55ee6eb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a55ee6eb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a55ee6eb
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a55ee6ebc0bb807db400c0c1626823b80374d106
Parents: 5d57305
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 8 22:03:29 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 8 22:03:29 2014 -0500
----------------------------------------------------------------------
proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a55ee6eb/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 3413c94..de7ca80 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -226,6 +226,10 @@ public class ProxyServer implements AccumuloProxy.Iface {
try {
throw ex;
} catch (AccumuloException e) {
+ Throwable cause = e.getCause();
+ if (null != cause && TableNotFoundException.class.equals(cause.getClass())) {
+ throw new org.apache.accumulo.proxy.thrift.TableNotFoundException(cause.toString());
+ }
handleAccumuloException(e);
} catch (AccumuloSecurityException e) {
handleAccumuloSecurityException(e);
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b547531
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b547531
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b547531
Branch: refs/heads/master
Commit: 9b5475314fcdd15459422ef7d33c2abca4eb25cc
Parents: 0c92a63 a55ee6e
Author: Josh Elser <el...@apache.org>
Authored: Wed Jan 8 22:04:43 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jan 8 22:04:43 2014 -0500
----------------------------------------------------------------------
pom.xml | 2 +-
proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b547531/pom.xml
----------------------------------------------------------------------