Skip to content

Commit db63e67

Browse files
committed
Fixed proper response to ServiceServer not running, No such service from remote client.
1 parent 3fb5a3c commit db63e67

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/java/org/ros/internal/node/rpc/MasterRpcEndpointImpl.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,15 @@ public List<Object> unregisterSubscriber(String callerId, String topicName, Stri
143143

144144
@Override
145145
public List<Object> lookupService(String callerId, String serviceName) {
146-
RemoteRequestInterface rri = new RemoteRequest("org.ros.internal.node.server.master.MasterServer",
146+
RemoteRequestInterface rri = new RemoteRequest("org.ros.internal.node.server.master.MasterServer",
147147
"lookupService",
148148
GraphName.of(serviceName));
149-
InetSocketAddress slaveUri = (InetSocketAddress) remoteMaster.queue(rri);//master.lookupService(GraphName.of(serviceName));
150-
if (slaveUri != null) {
149+
Object sock = remoteMaster.queue(rri);//master.lookupService(GraphName.of(serviceName));
150+
if (sock != null && sock instanceof InetSocketAddress) {
151+
InetSocketAddress slaveUri = (InetSocketAddress)sock;
151152
return Response.newSuccess("Success", slaveUri.toString()).toList();
152153
}
153-
return Response.newError("No such service.", null).toList();
154+
return Response.newError("No such service.", callerId+" "+serviceName).toList();
154155
}
155156

156157
@Override

0 commit comments

Comments
 (0)