Merge bf06657 into c4fab1a

.travis.yml

@@ -1,9 +1,9 @@
 language: go
 go:
-  - 1.9
+  - "1.x"
 
 jdk:
-  - oraclejdk9
+  - oraclejdk10
 
 sudo: false
 
@@ -12,13 +12,13 @@ branches:
     - master
 
 before_install:
-  - wget http://apache.cs.utah.edu/zookeeper/zookeeper-${zk_version}/zookeeper-${zk_version}.tar.gz
-  - tar -zxvf zookeeper*tar.gz && zip -d zookeeper-${zk_version}/contrib/fatjar/zookeeper-${zk_version}-fatjar.jar 'META-INF/*.SF' 'META-INF/*.DSA'
+  - wget -q http://apache.cs.utah.edu/zookeeper/zookeeper-${zk_version}/zookeeper-${zk_version}.tar.gz
+  - tar -zxf zookeeper*tar.gz && zip -d zookeeper-${zk_version}/zookeeper-contrib/zookeeper-contrib-fatjar/zookeeper-${zk_version}-fatjar.jar 'META-INF/*.SF' 'META-INF/*.DSA'
   - go get github.com/mattn/goveralls
   - go get golang.org/x/tools/cmd/cover
 
 script:
-  - jdk_switcher use oraclejdk9
+  - jdk_switcher use oraclejdk10
   - go build ./...
   - go fmt ./...
   - go vet ./...
@@ -30,4 +30,4 @@ env:
   global:
     secure: Coha3DDcXmsekrHCZlKvRAc+pMBaQU1QS/3++3YCCUXVDBWgVsC1ZIc9df4RLdZ/ncGd86eoRq/S+zyn1XbnqK5+ePqwJoUnJ59BE8ZyHLWI9ajVn3fND1MTduu/ksGsS79+IYbdVI5wgjSgjD3Ktp6Y5uPl+BPosjYBGdNcHS4=
   matrix:
-    - zk_version=3.4.10
+    - zk_version=3.4.14

zk/server_java.go

@@ -86,6 +86,8 @@ func (sc ServerConfig) Marshall(w io.Writer) error {
 var jarSearchPaths = []string{
 	"zookeeper-*/contrib/fatjar/zookeeper-*-fatjar.jar",
 	"../zookeeper-*/contrib/fatjar/zookeeper-*-fatjar.jar",
+	"zookeeper-*/zookeeper-contrib/zookeeper-contrib-fatjar/zookeeper-*-fatjar.jar",
+	"../zookeeper-*/zookeeper-contrib/zookeeper-contrib-fatjar/zookeeper-*-fatjar.jar",
 	"/usr/share/java/zookeeper-*.jar",
 	"/usr/local/zookeeper-*/contrib/fatjar/zookeeper-*-fatjar.jar",
 	"/usr/local/Cellar/zookeeper/*/libexec/contrib/fatjar/zookeeper-*-fatjar.jar",

zk/structs.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"reflect"
 	"runtime"
+	"strings"
 	"time"
 )
 
@@ -392,7 +393,7 @@ type encoder interface {
 func decodePacket(buf []byte, st interface{}) (n int, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			if e, ok := r.(runtime.Error); ok && e.Error() == "runtime error: slice bounds out of range" {
+			if e, ok := r.(runtime.Error); ok && strings.HasPrefix(e.Error(), "runtime error: slice bounds out of range") {
 				err = ErrShortBuffer
 			} else {
 				panic(r)
@@ -483,7 +484,7 @@ func decodePacketValue(buf []byte, v reflect.Value) (int, error) {
 func encodePacket(buf []byte, st interface{}) (n int, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			if e, ok := r.(runtime.Error); ok && e.Error() == "runtime error: slice bounds out of range" {
+			if e, ok := r.(runtime.Error); ok && strings.HasPrefix(e.Error(), "runtime error: slice bounds out of range") {
 				err = ErrShortBuffer
 			} else {
 				panic(r)