Skip to content

Commit 2b23c5e

Browse files
committed
Reduces visibility to keep the compatibility.
Adding public methods may break the subclasses if a method with same signature defined with less visibility. Also changes devmode version of ClientSerializationStreamReader to use the server-side base64 implementation to workaround devmode issue related to accessing package visibile method in supersourced classes. Change-Id: I2c928ea88a27e45b90ddc3f7efd237cbddad84ee
1 parent 783c71a commit 2b23c5e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

user/src/com/google/gwt/user/client/rpc/impl/AbstractSerializationStream.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ protected final void setVersion(int version) {
116116
*
117117
* Keep this synchronized with the version in Base64Utils.
118118
*/
119-
public static long longFromBase64(String value) {
119+
static long longFromBase64(String value) {
120120
int pos = 0;
121121
long longVal = base64Value(value.charAt(pos++));
122122
int len = value.length();
@@ -133,7 +133,7 @@ public static long longFromBase64(String value) {
133133
*
134134
* Keep this synchronized with the version in Base64Utils.
135135
*/
136-
public static String longToBase64(long value) {
136+
static String longToBase64(long value) {
137137
// Convert to ints early to avoid need for long ops
138138
int low = (int) (value & 0xffffffff);
139139
int high = (int) (value >> 32);

user/src/com/google/gwt/user/client/rpc/impl/ClientSerializationStreamReader.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.google.gwt.dev.js.ast.JsVisitor;
3838
import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException;
3939
import com.google.gwt.user.client.rpc.SerializationException;
40+
import com.google.gwt.user.server.Base64Utils;
4041

4142
import java.io.StringReader;
4243
import java.util.ArrayList;
@@ -382,7 +383,8 @@ public int readInt() {
382383

383384
@Override
384385
public long readLong() {
385-
return longFromBase64(((JsStringLiteral) decoder.getValues().get(--index)).getValue());
386+
return Base64Utils.longFromBase64(
387+
((JsStringLiteral) decoder.getValues().get(--index)).getValue());
386388
}
387389

388390
@Override

0 commit comments

Comments
 (0)