Author: vinoski
Date: Mon Dec 18 15:09:14 2006
New Revision: 488450
URL: http://svn.apache.org/viewvc?view=rev&rev=488450
Log:
clean up warnings about unused variables
Remove all warnings in common, broker, client, and systests regarding
unused variables, as indicated by Eclipse builds.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
Mon Dec 18 15:09:14 2006
@@ -522,10 +522,10 @@
*/
public void unregisterExchange(String exchangeName) throws JMException
{
- boolean inUse = false;
// TODO
// Check if the exchange is in use.
- // Check if there are queue-bindings with the exchnage and
unregister
+ // boolean inUse = false;
+ // Check if there are queue-bindings with the exchange and
unregister
// when there are no bindings.
try
{
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
Mon Dec 18 15:09:14 2006
@@ -61,7 +61,6 @@
*/
for (Method method : interfaceClass.getMethods())
{
- int argCount = method.getParameterTypes().length;
String name = method.getName();
Class<?> resultType = method.getReturnType();
MBeanAttributeInfo attributeInfo = null;
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/plain/PlainSaslServer.java
Mon Dec 18 15:09:14 2006
@@ -62,7 +62,7 @@
}
// we do not currently support authcid in any meaningful way
- String authcid = new String(response, 0, authzidNullPosition,
"utf8");
+ // String authcid = new String(response, 0, authzidNullPosition,
"utf8");
String authzid = new String(response, authzidNullPosition + 1,
authcidNullPosition - 1, "utf8");
// we do not care about the prompt but it throws if null
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/handler/ConnectionOpenOkMethodHandler.java
Mon Dec 18 15:09:14 2006
@@ -20,20 +20,14 @@
*/
package org.apache.qpid.client.handler;
-import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.protocol.AMQMethodEvent;
-import org.apache.qpid.client.protocol.AMQProtocolSession;
import org.apache.qpid.client.state.AMQState;
import org.apache.qpid.client.state.AMQStateManager;
import org.apache.qpid.client.state.StateAwareMethodListener;
-import org.apache.qpid.framing.ConnectionOpenOkBody;
public class ConnectionOpenOkMethodHandler implements StateAwareMethodListener
{
-
- private static final Logger _logger =
Logger.getLogger(ConnectionOpenOkMethodHandler.class);
-
private static final ConnectionOpenOkMethodHandler _instance = new
ConnectionOpenOkMethodHandler();
public static ConnectionOpenOkMethodHandler getInstance()
@@ -47,8 +41,6 @@
public void methodReceived(AMQStateManager stateManager, AMQMethodEvent
evt) throws AMQException
{
- AMQProtocolSession session = evt.getProtocolSession();
- ConnectionOpenOkBody method = (ConnectionOpenOkBody) evt.getMethod();
stateManager.changeState(AMQState.CONNECTION_OPEN);
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
Mon Dec 18 15:09:14 2006
@@ -127,7 +127,7 @@
_logger.info("Starting connection");
con.start();
TextMessage tm = (TextMessage) consumer.receive();
- TextMessage tm2 = (TextMessage) consumer.receive();
+ consumer.receive();
tm.acknowledge();
_logger.info("Received 2 messages, acknowledge() first message, should
acknowledge both");
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
Mon Dec 18 15:09:14 2006
@@ -31,7 +31,7 @@
public class MultipleConnectionTest extends TestCase
{
public static final String _defaultBroker = "vm://:1";
- public static String _connectionString = _defaultBroker;
+ public String _connectionString = _defaultBroker;
private static class Receiver
{
@@ -175,9 +175,6 @@
public static void main(String[] argv) throws Exception
{
String broker = argv.length > 0 ? argv[0] : _defaultBroker;
-
- int connections = 7;
- int sessions = 2;
MultipleConnectionTest test = new MultipleConnectionTest();
test._connectionString = broker;
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/CloseWithBlockingReceiveTest.java
Mon Dec 18 15:09:14 2006
@@ -25,7 +25,6 @@
import javax.jms.Connection;
import javax.jms.Session;
import javax.jms.MessageConsumer;
-import javax.jms.Message;
/**
* @author Apache Software Foundation
@@ -72,7 +71,7 @@
};
long startTime = System.currentTimeMillis();
new Thread(r).start();
- Message m = consumer.receive(10000);
+ consumer.receive(10000);
assertTrue(System.currentTimeMillis() - startTime < 10000);
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
Mon Dec 18 15:09:14 2006
@@ -54,8 +54,7 @@
{
try
{
- Connection connection = new AMQConnection(_broker, "guest",
"guest",
- "fred", "/test");
+ new AMQConnection(_broker, "guest", "guest", "fred", "/test");
}
catch (Exception e)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java
Mon Dec 18 15:09:14 2006
@@ -108,7 +108,7 @@
JMSMapMessage mm = TestMessageHelper.newJMSMapMessage();
mm.setString("value", null);
- char c = mm.getChar("value");
+ mm.getChar("value");
fail("Expected NullPointerException");
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/StreamMessageTest.java
Mon Dec 18 15:09:14 2006
@@ -89,10 +89,10 @@
StreamMessage msg2 = (StreamMessage) consumer.receive();
- byte b1 = msg2.readByte();
+ msg2.readByte();
try
{
- byte b2 = msg2.readByte();
+ msg2.readByte();
}
catch (Exception e)
{
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
Mon Dec 18 15:09:14 2006
@@ -260,7 +260,7 @@
TopicSession session2 = conn.createTopicSession(false,
Session.AUTO_ACKNOWLEDGE);
try
{
- MessageConsumer consumer2 = session2.createConsumer(topic);
+ session2.createConsumer(topic);
fail("Expected a JMSException when subscribing to a temporary
topic created on adifferent session");
}
catch (JMSException je)
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
Mon Dec 18 15:09:14 2006
@@ -43,8 +43,6 @@
TestQueue q6 = bindDefault("F0000=Aardvark", "F0001=Bear");
TestQueue q7 = bindDefault("F0000", "F0001=Bear");
TestQueue q8 = bindDefault("F0000=Aardvark", "F0001");
- TestQueue q9 = bindDefault("F0000=Apple", "F0001=Banana");
- TestQueue q10 = bindDefault("F0000=Apple", "F0001");
routeAndTest(new Message("Message1", "F0000"), q1);
routeAndTest(new Message("Message2", "F0000=Aardvark"), q1, q2);
@@ -74,7 +72,6 @@
TestQueue q2 = bindDefault("F0000=Aardvark", "F0001=Bear",
"X-match=any");
TestQueue q3 = bindDefault("F0000", "F0001=Bear", "X-match=any");
TestQueue q4 = bindDefault("F0000=Aardvark", "F0001", "X-match=any");
- TestQueue q5 = bindDefault("F0000=Apple", "F0001=Banana",
"X-match=any");
TestQueue q6 = bindDefault("F0000=Apple", "F0001", "X-match=any");
routeAndTest(new Message("Message1", "F0000"), q1, q3);
@@ -87,16 +84,14 @@
public void testMandatory() throws AMQException
{
- TestQueue q1 = bindDefault("F0000");
+ bindDefault("F0000");
Message m1 = new Message("Message1", "XXXXX");
Message m2 = new Message("Message2", "F0000");
BasicPublishBody pb1 = m1.getPublishBody();
pb1.mandatory = true;
- BasicPublishBody pb2 = m1.getPublishBody();
+ BasicPublishBody pb2 = m2.getPublishBody();
pb2.mandatory = true;
routeAndTest(m1,true);
-
-
}
public static junit.framework.Test suite()
Modified:
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java?view=diff&rev=488450&r1=488449&r2=488450
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
Mon Dec 18 15:09:14 2006
@@ -5,7 +5,6 @@
import org.apache.qpid.test.VMBrokerSetup;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.util.TestApplicationRegistry;
-import org.apache.qpid.server.store.TestableMemoryMessageStore;
import org.apache.qpid.client.*;
import org.apache.qpid.url.AMQBindingURL;
import org.apache.qpid.url.BindingURL;
@@ -57,16 +56,12 @@
_bouncedMessageList.clear();
Connection con = new AMQConnection("vm://:1", "guest", "guest",
"consumer1", "/test");
- TestableMemoryMessageStore store = (TestableMemoryMessageStore)
ApplicationRegistry.getInstance().getMessageStore();
-
AMQSession consumerSession = (AMQSession) con.createSession(false,
Session.CLIENT_ACKNOWLEDGE);
-
AMQHeadersExchange queue = new AMQHeadersExchange(new
AMQBindingURL(ExchangeDefaults.HEADERS_EXCHANGE_CLASS+"://"+ExchangeDefaults.HEADERS_EXCHANGE_NAME+"/test/queue1?"+
BindingURL.OPTION_ROUTING_KEY+"='F0000=1'"));
FieldTable ft = new PropertyFieldTable();
ft.setString("F1000","1");
MessageConsumer consumer = consumerSession.createConsumer(queue,
AMQSession.DEFAULT_PREFETCH_LOW_MARK, AMQSession.DEFAULT_PREFETCH_HIGH_MARK,
false, false, (String)null, ft);
-
//force synch to ensure the consumer has resulted in a bound queue
((AMQSession)
consumerSession).declareExchangeSynch(ExchangeDefaults.HEADERS_EXCHANGE_NAME,
ExchangeDefaults.HEADERS_EXCHANGE_CLASS);
