diff options
author | Henning Baldersheim <balder@verizonmedia.com> | 2020-03-09 13:33:11 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@verizonmedia.com> | 2020-03-09 13:33:11 +0000 |
commit | 6dafbbe4a7321279fc8eb5bd86be62f72fff80a0 (patch) | |
tree | 9d3fc26dd512c185cf2acc801efa2318ca74fe95 /messagebus | |
parent | e58c309c1efc4028bf853c41004ddf369546c7fb (diff) |
void creating strings when not needed.
Do not depend on toString(), use toUtf8 instead.
Diffstat (limited to 'messagebus')
4 files changed, 9 insertions, 9 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java index adf889a7b6f..0fd52e9bdbc 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java @@ -473,7 +473,7 @@ public class RPCNetwork implements Network, MethodHandler { synchronized (this) { if (version == null) { hasError = true; - } else if (version.compareTo(this.version) < 0) { + } else if (version.isBefore(this.version)) { this.version = version; } if (--pending == 0) { diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV1.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV1.java index 952bcdcfe04..ccded0e8d1b 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV1.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV1.java @@ -64,7 +64,7 @@ public class RPCSendV1 extends RPCSend { long timeRemaining, byte[] payload, int traceLevel) { Request req = new Request(METHOD_NAME); Values v = req.parameters(); - v.add(new StringValue(version.toString())); + v.add(new StringValue(version.toUtf8())); v.add(new StringValue(route.toString())); v.add(new StringValue(address.getSessionName())); v.add(new Int8Value(msg.getRetryEnabled() ? (byte)1 : (byte)0)); @@ -140,7 +140,7 @@ public class RPCSendV1 extends RPCSend { eMessages[i] = error.getMessage(); eServices[i] = error.getService() != null ? error.getService() : ""; } - ret.add(new StringValue(version.toString())); + ret.add(new StringValue(version.toUtf8())); ret.add(new DoubleValue(reply.getRetryDelay())); ret.add(new Int32Array(eCodes)); ret.add(new StringArray(eMessages)); diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV2.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV2.java index 09f7bbb15de..bb243651447 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV2.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendV2.java @@ -21,7 +21,6 @@ import com.yahoo.slime.BinaryFormat; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; -import com.yahoo.text.Utf8; import com.yahoo.text.Utf8Array; /** @@ -88,7 +87,7 @@ public class RPCSendV2 extends RPCSend { Slime slime = new Slime(); Cursor root = slime.setObject(); - root.setString(VERSION_F, version.toString()); + root.setString(VERSION_F, version.toUtf8().getBytes()); root.setString(ROUTE_F, route.toString()); root.setString(SESSION_F, address.getSessionName()); root.setString(PROTOCOL_F, msg.getProtocol().toString()); @@ -162,7 +161,7 @@ public class RPCSendV2 extends RPCSend { p.retryEnabled = root.field(USERETRY_F).asBool(); p.retry = (int)root.field(RETRY_F).asLong(); p.timeRemaining = root.field(TIMEREMAINING_F).asLong(); - p.protocolName = new Utf8Array(Utf8.toBytes(root.field(PROTOCOL_F).asString())); + p.protocolName = new Utf8Array(root.field(PROTOCOL_F).asUtf8()); p.payload = root.field(BLOB_F).asData(); p.traceLevel = (int)root.field(TRACELEVEL_F).asLong(); return p; @@ -177,9 +176,9 @@ public class RPCSendV2 extends RPCSend { Slime slime = new Slime(); Cursor root = slime.setObject(); - root.setString(VERSION_F, version.toString()); + root.setString(VERSION_F, version.toUtf8().getBytes()); root.setDouble(RETRYDELAY_F, reply.getRetryDelay()); - root.setString(PROTOCOL_F, reply.getProtocol().toString()); + root.setString(PROTOCOL_F, reply.getProtocol().getBytes()); root.setData(BLOB_F, payload); if (reply.getTrace().getLevel() > 0) { root.setString(TRACE_F, reply.getTrace().getRoot().encode()); diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java index fe248c6b8df..53c0c855116 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java @@ -8,6 +8,7 @@ import com.yahoo.jrt.Spec; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.log.LogLevel; +import com.yahoo.text.Utf8Array; import java.util.LinkedList; import java.util.List; @@ -133,7 +134,7 @@ public class RPCTarget implements RequestWaiter { synchronized (this) { targetInvoked = false; if (req.checkReturnTypes("s")) { - String str = req.returnValues().get(0).asString(); + Utf8Array str = req.returnValues().get(0).asUtf8Array(); try { version = new Version(str); if (shouldLog) { |