clean up warnings about unused variables

Remove all warnings in common, broker, client, and systests regarding
unused variables, as indicated by Eclipse builds.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488450 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 12 deletions

diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
index c220442a78..c01241d11d 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
@@ -43,8 +43,6 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
         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 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
         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 class HeadersExchangeTest extends AbstractHeadersExchangeTestBase
 
     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()
diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 4dffe3e75f..ec6a82cc29 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -5,7 +5,6 @@ import org.apache.log4j.Logger;
 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 @@ public class ReturnUnroutableMandatoryMessageTest extends TestCase implements Ex
         _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);