You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2018/10/09 14:35:13 UTC
[accumulo] branch master updated: Revert "Work around compilation
bug in Eclipse Oxygen"
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 8493a10 Revert "Work around compilation bug in Eclipse Oxygen"
8493a10 is described below
commit 8493a104b53ee638337abcd890d642e494701e81
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Tue Oct 9 10:24:44 2018 -0400
Revert "Work around compilation bug in Eclipse Oxygen"
Fixes #485; workaround not needed in latest version of Eclipse Photon
This reverts commit b49865d08f3edb425306c3e48689c8836d947ad5.
---
.../accumulo/test/rpc/thrift/SimpleThriftService.java | 2 +-
test/src/main/scripts/generate-thrift.sh | 17 -----------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
index c5bd672..0523268 100644
--- a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
+++ b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
@@ -405,7 +405,7 @@ public class SimpleThriftService {
super(iface, getProcessMap(processMap));
}
- private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ?>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
+ private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
processMap.put("echoPass", new echoPass());
processMap.put("onewayPass", new onewayPass());
processMap.put("echoFail", new echoFail());
diff --git a/test/src/main/scripts/generate-thrift.sh b/test/src/main/scripts/generate-thrift.sh
index f1b0d27..061ad4f 100755
--- a/test/src/main/scripts/generate-thrift.sh
+++ b/test/src/main/scripts/generate-thrift.sh
@@ -22,20 +22,3 @@ PACKAGES_TO_GENERATE=(test.rpc)
. ../core/src/main/scripts/generate-thrift.sh
-# fix SimpleThriftService compilation error in Eclipse Oxygen
-# see https://bugs.eclipse.org/bugs/show_bug.cgi?id=534559
-patch -p2 <<'EOF'
-diff --git a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
-index d76a789e0..fa0ea29e6 100644
---- a/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
-+++ b/test/src/main/java/org/apache/accumulo/test/rpc/thrift/SimpleThriftService.java
-@@ -405,7 +405,7 @@ public class SimpleThriftService {
- super(iface, getProcessMap(processMap));
- }
-
-- private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
-+ private static <I extends Iface> java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ?>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
- processMap.put("echoPass", new echoPass());
- processMap.put("onewayPass", new onewayPass());
- processMap.put("echoFail", new echoFail());
-EOF