java: Switch the resumeMarker from String to byte[]
The fact that the resumeMarker was a String was an accident.
MultiPart: 1/2
Change-Id: I425ef577aa5cfaf357be7d9b364d0eac3246a79a
diff --git a/services/syncbase/bridge/cgo/jni_lib.go b/services/syncbase/bridge/cgo/jni_lib.go
index 9287212..04078f1 100644
--- a/services/syncbase/bridge/cgo/jni_lib.go
+++ b/services/syncbase/bridge/cgo/jni_lib.go
@@ -287,7 +287,7 @@
row: jGetFieldID(env, cls, "row", "Ljava/lang/String;"),
changeType: jGetFieldID(env, cls, "changeType", "Lio/v/syncbase/core/WatchChange$ChangeType;"),
value: jGetFieldID(env, cls, "value", "[B"),
- resumeMarker: jGetFieldID(env, cls, "resumeMarker", "Ljava/lang/String;"),
+ resumeMarker: jGetFieldID(env, cls, "resumeMarker", "[B"),
fromSync: jGetFieldID(env, cls, "fromSync", "Z"),
continued: jGetFieldID(env, cls, "continued", "Z"),
}
diff --git a/services/syncbase/bridge/cgo/lib.h b/services/syncbase/bridge/cgo/lib.h
index c129a0b..d1ad5e0 100644
--- a/services/syncbase/bridge/cgo/lib.h
+++ b/services/syncbase/bridge/cgo/lib.h
@@ -102,7 +102,7 @@
v23_syncbase_String row;
v23_syncbase_ChangeType changeType;
v23_syncbase_Bytes value;
- v23_syncbase_String resumeMarker;
+ v23_syncbase_Bytes resumeMarker;
bool fromSync;
bool continued;
} v23_syncbase_WatchChange;
diff --git a/services/syncbase/bridge/cgo/types.go b/services/syncbase/bridge/cgo/types.go
index 6492064..902bbd8 100644
--- a/services/syncbase/bridge/cgo/types.go
+++ b/services/syncbase/bridge/cgo/types.go
@@ -440,7 +440,7 @@
}
}
x.value.init(value)
- x.resumeMarker.init(string(wc.ResumeMarker))
+ x.resumeMarker.init(wc.ResumeMarker)
x.fromSync = C.bool(wc.FromSync)
x.continued = C.bool(wc.Continued)
return nil
