From 6b1d4b0f83864c905fa118bd555d102c50aa616f Mon Sep 17 00:00:00 2001
From: Damon Kohler <damonkohler@google.com>
Date: Fri, 27 Jul 2012 16:28:44 +0200
Subject: [PATCH] Fixes broken test.
---
.../internal/transport/queue/IncomingMessageQueue.java | 4 ++--
.../internal/transport/queue/OutgoingMessageQueue.java | 10 +++++-----
.../src/main/java/org/ros/namespace/NameResolver.java | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/rosjava/src/main/java/org/ros/internal/transport/queue/IncomingMessageQueue.java b/rosjava/src/main/java/org/ros/internal/transport/queue/IncomingMessageQueue.java
index f87672fc..d81d1803 100644
--- a/rosjava/src/main/java/org/ros/internal/transport/queue/IncomingMessageQueue.java
+++ b/rosjava/src/main/java/org/ros/internal/transport/queue/IncomingMessageQueue.java
@@ -37,14 +37,14 @@ public class IncomingMessageQueue<T> {
* {@link IncomingMessageQueue#addListener(MessageListener, int)} which are
* consumed by user provided {@link MessageListener}s.
*/
- private static final int QUEUE_CAPACITY = 16;
+ private static final int DEQUE_CAPACITY = 16;
private final MessageReceiver<T> messageReceiver;
private final MessageDispatcher<T> messageDispatcher;
public IncomingMessageQueue(MessageDeserializer<T> deserializer, ExecutorService executorService) {
CircularBlockingDeque<LazyMessage<T>> lazyMessages =
- new CircularBlockingDeque<LazyMessage<T>>(QUEUE_CAPACITY);
+ new CircularBlockingDeque<LazyMessage<T>>(DEQUE_CAPACITY);
messageReceiver = new MessageReceiver<T>(lazyMessages, deserializer);
messageDispatcher = new MessageDispatcher<T>(lazyMessages, executorService);
executorService.execute(messageDispatcher);
diff --git a/rosjava/src/main/java/org/ros/internal/transport/queue/OutgoingMessageQueue.java b/rosjava/src/main/java/org/ros/internal/transport/queue/OutgoingMessageQueue.java
index 5163a176..f9f3f8c3 100644
--- a/rosjava/src/main/java/org/ros/internal/transport/queue/OutgoingMessageQueue.java
+++ b/rosjava/src/main/java/org/ros/internal/transport/queue/OutgoingMessageQueue.java
@@ -42,10 +42,10 @@ public class OutgoingMessageQueue<T> {
private static final boolean DEBUG = false;
private static final Log log = LogFactory.getLog(OutgoingMessageQueue.class);
- private static final int QUEUE_CAPACITY = 16;
+ private static final int DEQUE_CAPACITY = 16;
private final MessageSerializer<T> serializer;
- private final CircularBlockingDeque<T> queue;
+ private final CircularBlockingDeque<T> deque;
private final ChannelGroup channelGroup;
private final Writer writer;
private final MessageBufferPool messageBufferPool;
@@ -57,7 +57,7 @@ public class OutgoingMessageQueue<T> {
private final class Writer extends CancellableLoop {
@Override
public void loop() throws InterruptedException {
- T message = queue.takeFirst();
+ T message = deque.takeFirst();
final ChannelBuffer buffer = messageBufferPool.acquire();
serializer.serialize(message, buffer);
if (DEBUG) {
@@ -79,7 +79,7 @@ public class OutgoingMessageQueue<T> {
public OutgoingMessageQueue(MessageSerializer<T> serializer, ExecutorService executorService) {
this.serializer = serializer;
- queue = new CircularBlockingDeque<T>(QUEUE_CAPACITY);
+ deque = new CircularBlockingDeque<T>(DEQUE_CAPACITY);
channelGroup = new DefaultChannelGroup();
writer = new Writer();
messageBufferPool = new MessageBufferPool();
@@ -101,7 +101,7 @@ public class OutgoingMessageQueue<T> {
* the message to add to the queue
*/
public void add(T message) {
- queue.addLast(message);
+ deque.addLast(message);
setLatchedMessage(message);
}
diff --git a/rosjava/src/main/java/org/ros/namespace/NameResolver.java b/rosjava/src/main/java/org/ros/namespace/NameResolver.java
index b12af1fe..e087b65c 100644
--- a/rosjava/src/main/java/org/ros/namespace/NameResolver.java
+++ b/rosjava/src/main/java/org/ros/namespace/NameResolver.java
@@ -75,7 +75,7 @@ public class NameResolver {
public GraphName resolve(GraphName namespace, GraphName name) {
GraphName remappedNamespace = lookUpRemapping(namespace);
if (!remappedNamespace.isGlobal()) {
- throw new IllegalStateException(String.format(
+ throw new IllegalArgumentException(String.format(
"Namespace %s (remapped from %s) must be global.", remappedNamespace, namespace));
}
GraphName remappedName = lookUpRemapping(name);
--
GitLab