Applied QPID-162 patches from Kevin Smith

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

20 files changed, 40 insertions, 45 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
index 9255590afb..d1750ebbb5 100644
--- a/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
+++ b/java/common/src/main/java/org/apache/qpid/AMQChannelException.java
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid;
 
-import org.apache.qpid.framing.ChannelCloseBody;
 import org.apache.qpid.framing.AMQFrame;
 import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.ChannelCloseBody;
 
 public class AMQChannelException extends AMQException
 {
diff --git a/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java b/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
index ad252aec35..fdb2e60c62 100644
--- a/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
+++ b/java/common/src/main/java/org/apache/qpid/codec/AMQEncoder.java
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid.codec;
 
+import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolEncoder;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-import org.apache.mina.common.IoSession;
 import org.apache.qpid.framing.AMQDataBlockEncoder;
 
 public class AMQEncoder implements ProtocolEncoder
diff --git a/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java b/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
index f4f764db1b..80377ffdf5 100644
--- a/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
+++ b/java/common/src/main/java/org/apache/qpid/common/QpidProperties.java
@@ -20,12 +20,12 @@
  */
 package org.apache.qpid.common;
 
-import org.apache.log4j.Logger;
-
-import java.util.Properties;
-import java.util.Map;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.log4j.Logger;
 
 public class QpidProperties
 {
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/Configured.java b/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
index 2160dd6295..7d2e7d3a5d 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
+++ b/java/common/src/main/java/org/apache/qpid/configuration/Configured.java
@@ -20,9 +20,9 @@
  */
 package org.apache.qpid.configuration;
 
+import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java b/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
index 12eebbf2b0..67af0b0b74 100644
--- a/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
+++ b/java/common/src/main/java/org/apache/qpid/configuration/PropertyException.java
@@ -20,8 +20,8 @@
  */
 package org.apache.qpid.configuration;
 
-import org.apache.qpid.AMQException;
 import org.apache.log4j.Logger;
+import org.apache.qpid.AMQException;
 
 /**
  * Indicates an error parsing a property expansion.
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
index e426651588..43f888c029 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockDecoder.java
@@ -26,9 +26,6 @@ import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
 import org.apache.qpid.protocol.AMQVersionAwareProtocolSession;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class AMQDataBlockDecoder
 {
     private static final String SESSION_METHOD_BODY_FACTORY = "QPID_SESSION_METHOD_BODY_FACTORY";
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
index 478cdeb406..aedea6dd89 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQDataBlockEncoder.java
@@ -20,16 +20,15 @@
  */
 package org.apache.qpid.framing;
 
+import java.util.Collections;
+import java.util.Set;
+
 import org.apache.log4j.Logger;
 import org.apache.mina.common.ByteBuffer;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
 import org.apache.mina.filter.codec.demux.MessageEncoder;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Collections;
-
 public final class AMQDataBlockEncoder implements MessageEncoder
 {
 	private static final Logger _logger = Logger.getLogger(AMQDataBlockEncoder.class);
diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
index 47d349a675..f51296dafc 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
@@ -1,9 +1,7 @@
 package org.apache.qpid.framing;

 

-import org.apache.mina.common.ByteBuffer;

 import org.apache.log4j.Logger;

-

-import java.util.Arrays;

+import org.apache.mina.common.ByteBuffer;

 

 /**

  * A short string is a representation of an AMQ Short String

diff --git a/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java b/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
index 5ac7f8827b..1419dd75b1 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/AMQTypeMap.java
@@ -20,8 +20,8 @@
  */

 package org.apache.qpid.framing;

 

-import java.util.Map;

 import java.util.HashMap;

+import java.util.Map;

 

 public class AMQTypeMap

 {

diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
index 339f83588d..4e3768e4d4 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
@@ -20,11 +20,11 @@
  */
 package org.apache.qpid.framing;
 
+import java.nio.charset.Charset;
+
 import org.apache.log4j.Logger;
 import org.apache.mina.common.ByteBuffer;
 
-import java.nio.charset.Charset;
-
 public class EncodingUtils
 {
     private static final Logger _logger = Logger.getLogger(EncodingUtils.class);
diff --git a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
index 1a72910536..246e5ebc90 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/FieldTable.java
@@ -20,12 +20,18 @@
  */
 package org.apache.qpid.framing;
 
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
 import org.apache.log4j.Logger;
 import org.apache.mina.common.ByteBuffer;
 import org.apache.qpid.AMQPInvalidClassException;
 
-import java.util.*;
-
 //extends FieldTable
 public class FieldTable
 {
diff --git a/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java b/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
index 9bc8232d61..1df62c7b1b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/VersionSpecificRegistry.java
@@ -20,8 +20,8 @@
  */

 package org.apache.qpid.framing;

 

-import org.apache.mina.common.ByteBuffer;

 import org.apache.log4j.Logger;

+import org.apache.mina.common.ByteBuffer;

 

 public class VersionSpecificRegistry

 {

diff --git a/java/common/src/main/java/org/apache/qpid/pool/Event.java b/java/common/src/main/java/org/apache/qpid/pool/Event.java
index 43ff8f6a19..09890a103d 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/Event.java
+++ b/java/common/src/main/java/org/apache/qpid/pool/Event.java
@@ -20,10 +20,8 @@
  */
 package org.apache.qpid.pool;
 
-import org.apache.log4j.Logger;
 import org.apache.mina.common.IoFilter;
 import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IdleStatus;
 
 
 abstract public class Event
diff --git a/java/common/src/main/java/org/apache/qpid/pool/Job.java b/java/common/src/main/java/org/apache/qpid/pool/Job.java
index 9b3bcfa008..1dafdaf4fd 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/Job.java
+++ b/java/common/src/main/java/org/apache/qpid/pool/Job.java
@@ -20,11 +20,10 @@
  */
 package org.apache.qpid.pool;
 
-import org.apache.mina.common.IoSession;
-
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.mina.common.IoSession;
 
 /**
  * Holds events for a session that will be processed asynchronously by
diff --git a/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java b/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
index 073f1cdfa3..8126ca4bc8 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
+++ b/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
@@ -20,15 +20,14 @@
  */
 package org.apache.qpid.pool;
 
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 import org.apache.log4j.Logger;
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoFilterAdapter;
 import org.apache.mina.common.IoSession;
 
-import java.util.EnumSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 public class PoolingFilter extends IoFilterAdapter implements Job.JobCompletionHandler
 {
     private static final Logger _logger = Logger.getLogger(PoolingFilter.class);
@@ -240,3 +239,4 @@ public class PoolingFilter extends IoFilterAdapter implements Job.JobCompletionH
 
 }
 
+
diff --git a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java b/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
index c2f7f7ac48..278a569715 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
+++ b/java/common/src/main/java/org/apache/qpid/pool/ReadWriteThreadModel.java
@@ -21,8 +21,8 @@
 package org.apache.qpid.pool;
 
 import org.apache.mina.common.IoFilterChain;
-import org.apache.mina.filter.ReferenceCountingIoFilter;
 import org.apache.mina.common.ThreadModel;
+import org.apache.mina.filter.ReferenceCountingIoFilter;
 
 public class ReadWriteThreadModel implements ThreadModel
 {
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
index 523a24f278..a4d90e9ee3 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
+++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java
@@ -20,10 +20,10 @@
  */
 package org.apache.qpid.protocol;
 
-import org.apache.qpid.framing.AMQShortString;
-
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.framing.AMQShortString;
 
 public final class AMQConstant
 {
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
index f77b5084f3..85bbe50b11 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
+++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.protocol;
 
+import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQMethodBody;
 
 /**
diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
index a2d3de2f9e..b57c26e496 100644
--- a/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
+++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
@@ -20,7 +20,6 @@
  */

 package org.apache.qpid.protocol;

 

-import org.apache.qpid.framing.AMQDataBlock;

 import org.apache.qpid.framing.VersionSpecificRegistry;

 

 public interface AMQVersionAwareProtocolSession extends AMQProtocolWriter, ProtocolVersionAware

diff --git a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java b/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
index 11e6652bd7..04d152acf5 100644
--- a/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
+++ b/java/common/src/main/java/org/apache/qpid/url/AMQBindingURL.java
@@ -20,14 +20,12 @@
  */
 package org.apache.qpid.url;
 
-import org.apache.qpid.url.BindingURL;
-import org.apache.qpid.url.URLHelper;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-
-import java.util.HashMap;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
+
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.framing.AMQShortString;
 
 public class AMQBindingURL implements BindingURL
 {
@@ -281,4 +279,4 @@ public class AMQBindingURL implements BindingURL
 
     }
 
-}
\ No newline at end of file
+}