NO-JIRA: Ensure all control flow statements use braces (keeping CheckStyle happy)

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

34 files changed, 360 insertions, 81 deletions

diff --git a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java b/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
index a266edae00..6bea9d2ac0 100644
--- a/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
+++ b/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/util/XMLWriter.java
@@ -88,7 +88,9 @@ public class XMLWriter
     private String escapeXML(String xmlStr)
     {
         if (null == xmlStr)
+        {
             return null;
+        }
         xmlStr = xmlStr.replaceAll("&", "&");
         xmlStr = xmlStr.replace("<", "&lt;");
         xmlStr = xmlStr.replace(">", "&gt;");
diff --git a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index bc832cf570..0886ae2ae0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
@@ -207,8 +207,14 @@ class HeadersBinding
     {
         if(value instanceof String)
         {
-            if("any".equalsIgnoreCase((String) value)) return true;
-            if("all".equalsIgnoreCase((String) value)) return false;
+            if("any".equalsIgnoreCase((String) value))
+            {
+                return true;
+            }
+            if("all".equalsIgnoreCase((String) value))
+            {
+                return false;
+            }
         }
         _logger.warn("Ignoring unrecognised match type: " + value);
         return false;//default to all
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index ad9d2e6aca..10d7503800 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
@@ -154,7 +154,9 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
             return parentType + "." + obj.getType();
         }
         else
+        {
             return obj.getType();
+        }
     }
 
     protected String getHierarchicalName(ManagedObject obj)
@@ -168,7 +170,9 @@ public abstract class DefaultManagedObject extends StandardMBean implements Mana
             return parentName;
         }
         else
+        {
             return "";
+        }
     }
 
     private MBeanInfo buildMBeanInfo() throws NotCompliantMBeanException
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
index dc462f1d40..3be28036aa 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
@@ -327,7 +327,9 @@ class MBeanIntrospector {
                 paramInfo = new MBeanParameterInfo("p " + (i + 1), type, "parameter " + (i + 1));
             }
             if (paramInfo != null)
+            {
                 paramsInfo[i] = paramInfo;
+            }
         }
 
         return paramsInfo;
@@ -347,7 +349,9 @@ class MBeanIntrospector {
             MBeanConstructorInfo constructorInfo = getMBeanConstructorInfo(cons);
             //MBeanConstructorInfo constructorInfo = new MBeanConstructorInfo("desc", cons);
             if (constructorInfo != null)
+            {
                 constructors.add(constructorInfo);
+            }
         }
 
         return constructors.toArray(new MBeanConstructorInfo[0]);
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java b/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
index 79d3ab5bd0..05141a48a1 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
@@ -74,7 +74,7 @@ public class PriorityQueueList implements QueueEntryList<SimpleQueueEntryImpl>
         {
             final QueueEntryList<?> nodeEntryList = node.getQueueEntryList();
             int index;
-            for(index = _priorityLists.length-1; _priorityLists[index] != nodeEntryList; index--);
+            for(index = _priorityLists.length-1; _priorityLists[index] != nodeEntryList; index--) {};
 
             while(next == null && index != 0)
             {
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 18386def06..035645acc7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
@@ -772,7 +772,9 @@ public class SimpleAMQQueue implements AMQQueue, Subscription.StateListener, Mes
     private boolean mightAssign(final Subscription sub, final QueueEntry entry)
     {
         if(_messageGroupManager == null || !sub.acquires())
+        {
             return true;
+        }
         Subscription assigned = _messageGroupManager.getAssignedSubscription(entry);
         return (assigned == null) || (assigned == sub);
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
index 7336f4f8f6..1c18887f4d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
@@ -326,12 +326,21 @@ public class ObjectProperties
     @Override
     public boolean equals(Object o)
     {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
 
         ObjectProperties that = (ObjectProperties) o;
 
-        if (_properties != null ? !_properties.equals(that._properties) : that._properties != null) return false;
+        if (_properties != null ? !_properties.equals(that._properties) : that._properties != null)
+        {
+            return false;
+        }
 
         return true;
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
index 3a3a88e1b3..6b2dff7165 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
@@ -48,7 +48,10 @@ public class AssignedSubscriptionMessageGroupManager implements MessageGroupMana
     private static int pow2(final int i)
     {
         int val = 1;
-        while(val < i) val<<=1;
+        while(val < i)
+        {
+            val<<=1;
+        }
         return val;
     }
 
@@ -112,11 +115,15 @@ public class AssignedSubscriptionMessageGroupManager implements MessageGroupMana
         public boolean visit(final QueueEntry entry)
         {
             if(!entry.isAvailable())
+            {
                 return false;
+            }
 
             Object groupId = entry.getMessage().getMessageHeader().getHeader(_groupId);
             if(groupId == null)
+            {
                 return false;
+            }
 
             Integer group = groupId.hashCode() & _groupMask;
             Subscription assignedSub = _groupMap.get(group);
diff --git a/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java b/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
index e7b4dd7a37..62e94f6f2e 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
@@ -189,7 +189,9 @@ public class DefinedGroupMessageGroupManager implements MessageGroupManager
         public boolean visit(final QueueEntry entry)
         {
             if(!entry.isAvailable())
+            {
                 return false;
+            }
 
             Object groupId = getKey(entry);
 
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 28a1b2d9f2..8fc921822c 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
@@ -229,13 +229,17 @@ public class CurrentActorTest extends BaseConnectionActorTestCase
 
                 // Verify it was the same actor as we set earlier
                 if(!actor.equals(CurrentActor.get()))
-                   throw new IllegalArgumentException("Retrieved actor is not as expected ");
+                {
+                    throw new IllegalArgumentException("Retrieved actor is not as expected ");
+                }
 
                 // Verify that removing the actor works for this thread
                 CurrentActor.remove();
 
                 if(CurrentActor.get() != defaultActor)
-                   throw new IllegalArgumentException("CurrentActor ("+CurrentActor.get()+") should be default actor" + defaultActor);
+                {
+                    throw new IllegalArgumentException("CurrentActor ("+CurrentActor.get()+") should be default actor" + defaultActor);
+                }
             }
             catch (Throwable e)
             {
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java b/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
index f4e17c5c4c..9548eab4c5 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/OptionParser.java
@@ -205,7 +205,9 @@ public class OptionParser
         if (op.startsWith("'"))
         {
             if (!op.endsWith("'")) 
+            {
                 throw new IllegalArgumentException(" The option " + op + " needs to be inside quotes");
+            }
             
             return op.substring(1,op.length() -1);
         }
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
index 7acb73c2ad..e96689b7b1 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
@@ -50,7 +50,10 @@ public class AMQConnectionURL implements ConnectionURL
 
     public AMQConnectionURL(String fullURL) throws URLSyntaxException
     {
-        if (fullURL == null) throw new IllegalArgumentException("URL cannot be null");
+        if (fullURL == null)
+        {
+            throw new IllegalArgumentException("URL cannot be null");
+        }
         _url = fullURL;
         _options = new HashMap<String, String>();
         _brokers = new LinkedList<BrokerDetails>();
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index b910dbe7da..76828afd6a 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -109,11 +109,26 @@ public abstract class AMQDestination implements Destination, Referenceable
         
       public static AddressOption getOption(String str)
       {
-          if ("always".equals(str)) return ALWAYS;
-          else if ("never".equals(str)) return NEVER;
-          else if ("sender".equals(str)) return SENDER;
-          else if ("receiver".equals(str)) return RECEIVER;
-          else throw new IllegalArgumentException(str + " is not an allowed value");
+          if ("always".equals(str))
+          {
+              return ALWAYS;
+          }
+          else if ("never".equals(str))
+          {
+              return NEVER;
+          }
+          else if ("sender".equals(str))
+          {
+              return SENDER;
+          }
+          else if ("receiver".equals(str))
+          {
+              return RECEIVER;
+          }
+          else
+          {
+              throw new IllegalArgumentException(str + " is not an allowed value");
+          }
       }
     }
     
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/TypedBytesContentReader.java b/java/client/src/main/java/org/apache/qpid/client/message/TypedBytesContentReader.java
index 1ae25eb1ed..b00ac7e34b 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/TypedBytesContentReader.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/TypedBytesContentReader.java
@@ -455,7 +455,7 @@ class TypedBytesContentReader implements TypedBytesCodes
             ByteBuffer dup = _data.duplicate();
             int pos = _data.position();
             byte b;
-            while((b = _data.get()) != 0);
+            while((b = _data.get()) != 0) {};
             dup.limit(_data.position()-1);
             return _charsetDecoder.decode(dup).toString();
 
diff --git a/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java b/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
index 65d1fd8e84..7bc1322e02 100644
--- a/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
+++ b/java/client/src/main/java/org/apache/qpid/collections/ReferenceMap.java
@@ -81,7 +81,8 @@ import java.util.Set;
  * 
  * @author Paul Jack
  */
-public class ReferenceMap extends AbstractMap {
+public class ReferenceMap extends AbstractMap
+{
 
     /**
      *  For serialization.
@@ -285,7 +286,10 @@ public class ReferenceMap extends AbstractMap {
         this.valueType = valueType;
 
         int v = 1;
-        while (v < capacity) v *= 2;
+        while (v < capacity)
+        {
+            v *= 2;
+        }
 
         this.table = new Entry[v];
         this.loadFactor = loadFactor;
@@ -373,12 +377,18 @@ public class ReferenceMap extends AbstractMap {
      *  @return  the entry associated with that key, or null
      *    if the key is not in this map
      */
-    private Entry getEntry(Object key) {
-        if (key == null) return null;
+    private Entry getEntry(Object key)
+    {
+        if (key == null)
+        {
+            return null;
+        }
         int hash = key.hashCode();
         int index = indexFor(hash);
-        for (Entry entry = table[index]; entry != null; entry = entry.next) {
-            if ((entry.hash == hash) && key.equals(entry.getKey())) {
+        for (Entry entry = table[index]; entry != null; entry = entry.next)
+        {
+            if ((entry.hash == hash) && key.equals(entry.getKey()))
+            {
                 return entry;
             }
         }
@@ -390,7 +400,8 @@ public class ReferenceMap extends AbstractMap {
      *  Converts the given hash code into an index into the
      *  hash table.
      */
-    private int indexFor(int hash) {
+    private int indexFor(int hash)
+    {
         // mix the bits to avoid bucket collisions...
         hash += ~(hash << 15);
         hash ^= (hash >>> 10);
@@ -458,10 +469,18 @@ public class ReferenceMap extends AbstractMap {
         int index = indexFor(hash);
         Entry previous = null;
         Entry entry = table[index];
-        while (entry != null) {
-            if (entry.purge(ref)) {
-                if (previous == null) table[index] = entry.next;
-                else previous.next = entry.next;
+        while (entry != null)
+        {
+            if (entry.purge(ref))
+            {
+                if (previous == null)
+                {
+                    table[index] = entry.next;
+                }
+                else
+                {
+                    previous.next = entry.next;
+                }
                 this.size--;
                 return;
             }
@@ -502,7 +521,10 @@ public class ReferenceMap extends AbstractMap {
     public boolean containsKey(Object key) {
         purge();
         Entry entry = getEntry(key);
-        if (entry == null) return false;
+        if (entry == null)
+        {
+            return false;
+        }
         return entry.getValue() != null;
     }
 
@@ -516,7 +538,10 @@ public class ReferenceMap extends AbstractMap {
     public Object get(Object key) {
         purge();
         Entry entry = getEntry(key);
-        if (entry == null) return null;
+        if (entry == null)
+        {
+            return null;
+        }
         return entry.getValue();
     }
 
@@ -533,11 +558,20 @@ public class ReferenceMap extends AbstractMap {
      *   is null
      */
     public Object put(Object key, Object value) {
-        if (key == null) throw new NullPointerException("null keys not allowed");
-        if (value == null) throw new NullPointerException("null values not allowed");
+        if (key == null)
+        {
+            throw new NullPointerException("null keys not allowed");
+        }
+        if (value == null)
+        {
+            throw new NullPointerException("null values not allowed");
+        }
 
         purge();
-        if (size + 1 > threshold) resize();
+        if (size + 1 > threshold)
+        {
+            resize();
+        }
 
         int hash = key.hashCode();
         int index = indexFor(hash);
@@ -567,7 +601,10 @@ public class ReferenceMap extends AbstractMap {
      *   the key was not in the map
      */
     public Object remove(Object key) {
-        if (key == null) return null;
+        if (key == null)
+        {
+            return null;
+        }
         purge();
         int hash = key.hashCode();
         int index = indexFor(hash);
@@ -575,8 +612,13 @@ public class ReferenceMap extends AbstractMap {
         Entry entry = table[index];
         while (entry != null) {
             if ((hash == entry.hash) && key.equals(entry.getKey())) {
-                if (previous == null) table[index] = entry.next;
-                else previous.next = entry.next;
+                if (previous == null)
+                {
+                    table[index] = entry.next;
+                }
+                else{
+                    previous.next = entry.next;
+                }
                 this.size--;
                 modCount++;
                 return entry.getValue();
@@ -594,7 +636,7 @@ public class ReferenceMap extends AbstractMap {
     public void clear() {
         Arrays.fill(table, null);
         size = 0;
-        while (queue.poll() != null); // drain the queue
+        while (queue.poll() != null) {}; // drain the queue
     }
 
 
@@ -617,8 +659,14 @@ public class ReferenceMap extends AbstractMap {
             }
 
             public boolean contains(Object o) {
-                if (o == null) return false;
-                if (!(o instanceof Map.Entry)) return false;
+                if (o == null)
+                {
+                    return false;
+                }
+                if (!(o instanceof Map.Entry))
+                {
+                    return false;
+                }
                 Map.Entry e = (Map.Entry)o;
                 Entry e2 = getEntry(e.getKey());
                 return (e2 != null) && e.equals(e2);
@@ -661,7 +709,10 @@ public class ReferenceMap extends AbstractMap {
      *  @return a set view of this map's keys
      */
     public Set keySet() {
-        if (keySet != null) return keySet;
+        if (keySet != null)
+        {
+            return keySet;
+        }
         keySet = new AbstractSet() {
             public int size() {
                 return ReferenceMap.this.size();
@@ -707,7 +758,10 @@ public class ReferenceMap extends AbstractMap {
      *  @return a collection view of this map's values.
      */
     public Collection values() {
-        if (values != null) return values;
+        if (values != null)
+        {
+            return values;
+        }
         values = new AbstractCollection()  {
             public int size() {
                 return ReferenceMap.this.size();
@@ -767,21 +821,36 @@ public class ReferenceMap extends AbstractMap {
 
         public Object setValue(Object object) {
             Object old = getValue();
-            if (valueType > HARD) ((Reference)value).clear();
+            if (valueType > HARD)
+            {
+                ((Reference)value).clear();
+            }
             value = toReference(valueType, object, hash);
             return old;
         }
 
 
         public boolean equals(Object o) {
-            if (o == null) return false;
-            if (o == this) return true;
-            if (!(o instanceof Map.Entry)) return false;
+            if (o == null)
+            {
+                return false;
+            }
+            if (o == this)
+            {
+                return true;
+            }
+            if (!(o instanceof Map.Entry))
+            {
+                return false;
+            }
             
             Map.Entry entry = (Map.Entry)o;
             Object key = entry.getKey();
             Object value = entry.getValue();
-            if ((key == null) || (value == null)) return false;
+            if ((key == null) || (value == null))
+            {
+                return false;
+            }
             return key.equals(getKey()) && value.equals(getValue());
         }
 
@@ -801,7 +870,10 @@ public class ReferenceMap extends AbstractMap {
             boolean r = (keyType > HARD) && (key == ref);
             r = r || ((valueType > HARD) && (value == ref));
             if (r) {
-                if (keyType > HARD) ((Reference)key).clear();
+                if (keyType > HARD)
+                {
+                    ((Reference)key).clear();
+                }
                 if (valueType > HARD) {
                     ((Reference)value).clear();
                 } else if (purgeValues) {
@@ -854,7 +926,10 @@ public class ReferenceMap extends AbstractMap {
                 }
                 nextKey = e.getKey();
                 nextValue = e.getValue();
-                if (nextNull()) entry = entry.next;
+                if (nextNull())
+                {
+                    entry = entry.next;
+                }
             }
             return true;
         }
@@ -873,7 +948,10 @@ public class ReferenceMap extends AbstractMap {
 
         protected Entry nextEntry() {    
             checkMod();
-            if (nextNull() && !hasNext()) throw new NoSuchElementException();
+            if (nextNull() && !hasNext())
+            {
+                throw new NoSuchElementException();
+            }
             previous = entry;
             entry = entry.next;
             currentKey = nextKey;
@@ -891,7 +969,10 @@ public class ReferenceMap extends AbstractMap {
 
         public void remove() {
             checkMod();
-            if (previous == null) throw new IllegalStateException();
+            if (previous == null)
+            {
+                throw new IllegalStateException();
+            }
             ReferenceMap.this.remove(currentKey);
             previous = null;
             currentKey = null;
diff --git a/java/common/Composite.tpl b/java/common/Composite.tpl
index c3e4765c9c..ad166a0170 100644
--- a/java/common/Composite.tpl
+++ b/java/common/Composite.tpl
@@ -211,9 +211,13 @@ ${
 if pack > 0:
   if f.empty:
     out("        if (value)\\n")
+    out("        {\\n")
     out("            packing_flags |= $(f.flag_mask(pack));\\n")
+    out("        }\\n")
     out("        else\\n")
-    out("            packing_flags &= ~$(f.flag_mask(pack));")
+    out("        {\\n")
+    out("            packing_flags &= ~$(f.flag_mask(pack));\\n")
+    out("        }\\n")
   else:
     out("        packing_flags |= $(f.flag_mask(pack));")
 }
@@ -301,6 +305,7 @@ for f in fields:
     continue
   if pack > 0:
     out("        if ((packing_flags & $(f.flag_mask(pack))) != 0)\n    ")
+    out("    {\n    ")
   pre = ""
   post = ""
   if f.type_node.name == "struct":
@@ -308,6 +313,8 @@ for f in fields:
   elif f.type_node.name == "domain":
     post = ".getValue()"
   out("        enc.write$(f.coder)($(pre)this.$(f.name)$(post));\n")
+  if pack > 0:
+    out("        }\n")
 }
     }
 
@@ -322,6 +329,7 @@ for f in fields:
     continue
   if pack > 0:
     out("        if ((packing_flags & $(f.flag_mask(pack))) != 0)\n    ")
+    out("    {\n    ")
   pre = ""
   post = ""
   arg = ""
@@ -332,6 +340,8 @@ for f in fields:
     pre = "%s.get(" % cname(f.type_node)
     post = ")"
   out("        this.$(f.name) = $(pre)dec.read$(f.coder)($(arg))$(post);\n")
+  if pack > 0:
+    out("        }\n")
 }
     }
 
@@ -343,7 +353,10 @@ ${
 for f in fields:
   if pack > 0:
     out("        if ((packing_flags & $(f.flag_mask(pack))) != 0)\n    ")
+    out("    {\n    ")
   out('        result.put("$(f.name)", $(f.get)());\n')
+  if pack > 0:
+    out("        }\n")
 }
 
         return result;
diff --git a/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java b/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
index 4c653e6ca0..971dd3fe2a 100644
--- a/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
+++ b/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
@@ -29,14 +29,20 @@ public class NetMatcher
     public void initInetNetworks(final Collection nets)
     {
         networks = new ArrayList();
-        for (Iterator iter = nets.iterator(); iter.hasNext(); ) try
+        for (Iterator iter = nets.iterator(); iter.hasNext(); )
         {
-            InetNetwork net = InetNetwork.getFromString((String) iter.next());
-            if (!networks.contains(net)) networks.add(net);
-        }
-        catch (java.net.UnknownHostException uhe)
-        {
-            log("Cannot resolve address: " + uhe.getMessage());
+            try
+            {
+                InetNetwork net = InetNetwork.getFromString((String) iter.next());
+                if (!networks.contains(net))
+                {
+                    networks.add(net);
+                }
+            }
+            catch (java.net.UnknownHostException uhe)
+            {
+                log("Cannot resolve address: " + uhe.getMessage());
+            }
         }
         networks.trimToSize();
     }
@@ -44,14 +50,20 @@ public class NetMatcher
     public void initInetNetworks(final String[] nets)
     {
         networks = new ArrayList();
-        for (int i = 0; i < nets.length; i++) try
-        {
-            InetNetwork net = InetNetwork.getFromString(nets[i]);
-            if (!networks.contains(net)) networks.add(net);
-        }
-        catch (java.net.UnknownHostException uhe)
+        for (int i = 0; i < nets.length; i++)
         {
-            log("Cannot resolve address: " + uhe.getMessage());
+            try
+            {
+                InetNetwork net = InetNetwork.getFromString(nets[i]);
+                if (!networks.contains(net))
+                {
+                    networks.add(net);
+                }
+            }
+            catch (java.net.UnknownHostException uhe)
+            {
+                log("Cannot resolve address: " + uhe.getMessage());
+            }
         }
         networks.trimToSize();
     }
@@ -71,10 +83,13 @@ public class NetMatcher
 
         boolean sameNet = false;
 
-        if (ip != null) for (Iterator iter = networks.iterator(); (!sameNet) && iter.hasNext(); )
+        if (ip != null)
         {
-            InetNetwork network = (InetNetwork) iter.next();
-            sameNet = network.contains(ip);
+            for (Iterator iter = networks.iterator(); (!sameNet) && iter.hasNext(); )
+            {
+                InetNetwork network = (InetNetwork) iter.next();
+                sameNet = network.contains(ip);
+            }
         }
         return sameNet;
     }
@@ -156,12 +171,21 @@ class InetNetwork
 
     public static InetNetwork getFromString(String netspec) throws java.net.UnknownHostException
     {
-        if (netspec.endsWith("*")) netspec = normalizeFromAsterisk(netspec);
+        if (netspec.endsWith("*"))
+        {
+            netspec = normalizeFromAsterisk(netspec);
+        }
         else
         {
             int iSlash = netspec.indexOf('/');
-            if (iSlash == -1) netspec += "/255.255.255.255";
-            else if (netspec.indexOf('.', iSlash) == -1) netspec = normalizeFromCIDR(netspec);
+            if (iSlash == -1)
+            {
+                netspec += "/255.255.255.255";
+            }
+            else if (netspec.indexOf('.', iSlash) == -1)
+            {
+                netspec = normalizeFromCIDR(netspec);
+            }
         }
 
         return new InetNetwork(InetAddress.getByName(netspec.substring(0, netspec.indexOf('/'))),
@@ -205,8 +229,12 @@ class InetNetwork
         String[] masks = {  "0.0.0.0/0.0.0.0", "0.0.0/255.0.0.0", "0.0/255.255.0.0", "0/255.255.255.0" };
         char[] srcb = netspec.toCharArray();                
         int octets = 0;
-        for (int i = 1; i < netspec.length(); i++) {
-            if (srcb[i] == '.') octets++;
+        for (int i = 1; i < netspec.length(); i++)
+        {
+            if (srcb[i] == '.')
+            {
+                octets++;
+            }
         }
         return (octets == 0) ? masks[0] : netspec.substring(0, netspec.length() -1 ).concat(masks[octets]);
     }
@@ -244,10 +272,18 @@ class InetNetwork
     private static InetAddress getByAddress(byte[] ip) throws java.net.UnknownHostException
     {
         InetAddress addr = null;
-        if (getByAddress != null) try {
-            addr = (InetAddress) getByAddress.invoke(null, new Object[] { ip });
-        } catch (IllegalAccessException e) {
-        } catch (java.lang.reflect.InvocationTargetException e) {
+        if (getByAddress != null)
+        {
+            try
+            {
+                addr = (InetAddress) getByAddress.invoke(null, new Object[] { ip });
+            }
+            catch (IllegalAccessException e)
+            {
+            }
+            catch (java.lang.reflect.InvocationTargetException e)
+            {
+            }
         }
 
         if (addr == null) {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
index 8d45f76a03..963a821864 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
@@ -179,7 +179,9 @@ public abstract class ApplicationRegistry
     public static List<ManagedServer> getClosedServers()
     {
         if (_closedServerList.isEmpty())
+        {
             return null;
+        }
         
         List<ManagedServer> list = new CopyOnWriteArrayList<ManagedServer>(_closedServerList);
         _closedServerList.clear();
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
index bca29a30ff..f80790ce0c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/AddServer.java
@@ -62,7 +62,9 @@ public class AddServer extends AbstractAction implements IWorkbenchWindowActionD
     public void run(IAction action)
     {
         if(_window == null)
+        {
             return;
+        }
         
         reset();
         createAddServerPopup();
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
index a0fdc2282a..c1634ef8f8 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/ReconnectServer.java
@@ -61,7 +61,9 @@ public class ReconnectServer extends AbstractAction implements IWorkbenchWindowA
     public void run(IAction action)
     {
         if(_window == null)
+        {
             return;
+        }
   
         try
         {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
index fc566952d7..c6cf3e82eb 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/ClientListener.java
@@ -73,7 +73,9 @@ public class ClientListener implements NotificationListener
     protected JMXServerRegistry getServerRegistry()
     {
         if (serverRegistry == null)
+        {
             serverRegistry = (JMXServerRegistry)ApplicationRegistry.getServerRegistry(server);
+        }
         
         return serverRegistry;
     }
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
index c2d48d23be..5df161823e 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/JMXServerRegistry.java
@@ -515,7 +515,9 @@ public class JMXServerRegistry extends ServerRegistry
     public List<ManagedBean> getObjectsToBeRemoved()
     {
         if (_mbeansToBeRemoved.isEmpty())
+        {
             return null;
+        }
         else
         {
             List<ManagedBean> list = new CopyOnWriteArrayList<ManagedBean>(_mbeansToBeRemoved);
@@ -548,7 +550,9 @@ public class JMXServerRegistry extends ServerRegistry
     {
         List<ManagedBean> list = getQueues(virtualHostName);
         if (list == null)
+        {
             return null;
+        }
         
         List<String> queueNames = new ArrayList<String>();
         for (ManagedBean mbean : list)
@@ -562,7 +566,9 @@ public class JMXServerRegistry extends ServerRegistry
     {
         List<ManagedBean> list = getExchanges(virtualHostName);
         if (list == null)
+        {
             return null;
+        }
         
         String[] exchanges = new String[list.size()];
         int i = 0;
@@ -577,7 +583,9 @@ public class JMXServerRegistry extends ServerRegistry
     {
         List<ManagedBean> list = getExchanges(virtualHostName);
         if (list == null)
+        {
             return null;
+        }
         
         String[] connections = new String[list.size()];
         int i = 0;
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
index 998e2c30e7..be7d488a15 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/jmx/MBeanUtility.java
@@ -153,7 +153,9 @@ public class MBeanUtility
         {
             String cause = ((MBeanException)ex).getTargetException().getMessage();
             if (cause == null)
+            {
                 cause = ex.toString();
+            }
             ViewUtility.popupInfoMessage(mbean.getInstanceName(), cause);
         }
         else if (ex instanceof JMException)
@@ -465,14 +467,20 @@ public class MBeanUtility
         
         // Check if this mbean sends any notification
         if (info == null || info.length == 0)
+        {
             return null;
+        }
         
         // Create notification model if not already set in the server registry for this mbean
         List<NotificationInfoModel> list = serverRegistry.getNotificationInfo(mbean);
         if (list != null) 
+        {
             return list.toArray(new NotificationInfoModel[0]);
+        }
         else
+        {
             list = new ArrayList<NotificationInfoModel>();
+        }
         
         for (int i = 0; i < info.length; i++)
         {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
index ccd4cf8df8..5b188d8046 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/AttributeData.java
@@ -64,7 +64,9 @@ public class AttributeData
     public void setValue(Object value)
     {
         if (value != null)
+        {
             this.value = value;
+        }
     }
     public boolean isReadable()
     {
@@ -91,6 +93,8 @@ public class AttributeData
             return true;
         }
         else
+        {
             return false;
+        }
     }
 }
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
index b3219f15ea..c4d2b91f81 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ManagedAttributeModel.java
@@ -31,7 +31,9 @@ public class ManagedAttributeModel
     public void setAttributeValue(String name, Object value)
     {
         if (value == null)
+        {
             return;
+        }
         
         AttributeData data = null;
         String dataType = value.getClass().getName();
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
index d12217c6eb..bf5301bf93 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/model/ParameterData.java
@@ -62,13 +62,21 @@ public class ParameterData
     public void setValueFromString(String strValue)
     {
         if ("int".equals(_type))
+        {
             _value = Integer.parseInt(strValue);
+        }
         else if (isBoolean())
+        {
             _value = Boolean.valueOf(strValue);
+        }
         else if ("long".equals(_type))
+        {
             _value = Long.parseLong(strValue);
+        }
         else
-            _value = strValue; 
+        {
+            _value = strValue;
+        }
     }
     
     public void setValue(Object value)
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
index fad58b992e..f929e73353 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/AttributesTabControl.java
@@ -297,7 +297,10 @@ public class AttributesTabControl extends TabControl
             if (item != null)
             {
                 AttributeData data = (AttributeData)item.getData();
-                if (tooltipShell != null  && !tooltipShell.isDisposed ()) tooltipShell.dispose ();
+                if (tooltipShell != null  && !tooltipShell.isDisposed ())
+                {
+                    tooltipShell.dispose ();
+                }
                 tooltipShell = new Shell(_table.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
                 tooltipShell.setBackground(event.display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
                 FillLayout layout = new FillLayout();
@@ -328,7 +331,9 @@ public class AttributesTabControl extends TabControl
         public void mouseMove(MouseEvent event)
         {
             if (tooltipShell == null)
+            {
                 return;
+            }
             
             tooltipShell.dispose();
             tooltipShell = null;
@@ -339,7 +344,9 @@ public class AttributesTabControl extends TabControl
         public void keyPressed(KeyEvent e)
         {
             if (tooltipShell == null)
+            {
                 return;
+            }
             
             tooltipShell.dispose();
             tooltipShell = null;
@@ -757,7 +764,9 @@ public class AttributesTabControl extends TabControl
     {
         int index = _table.getSelectionIndex();
         if (index == -1)
+        {
             return null;
+        }
         
         return (AttributeData)_table.getItem(index).getData();
     }
@@ -854,6 +863,7 @@ public class AttributesTabControl extends TabControl
                     break;
                 case 1 : // attribute value column 
                     if (attribute.getValue() != null)
+                    {
                         if (attribute.getValue() instanceof String[])
                         {
                             for(String val : (String[]) attribute.getValue()){
@@ -864,6 +874,7 @@ public class AttributesTabControl extends TabControl
                         {
                             result = String.valueOf(attribute.getValue());
                         }
+                    }
                     break;
                 default :
                     result = "";
@@ -886,9 +897,13 @@ public class AttributesTabControl extends TabControl
         {
             attribute = (AttributeData) element;
             if (attribute.isWritable())
+            {
                 return Display.getCurrent().getSystemColor(SWT.COLOR_BLUE);
+            }
             else
+            {
                 return Display.getCurrent().getSystemColor(SWT.COLOR_BLACK);
+            }
         }
         public Color getBackground(Object element)
         {
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
index 300485e23f..1ce31ae3d1 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/MBeanView.java
@@ -86,7 +86,9 @@ public class MBeanView extends ViewPart
         public void selectionChanged(IWorkbenchPart part, ISelection sel)
         {
             if (!(sel instanceof IStructuredSelection))
+            {
                 return;
+            }
 
             IStructuredSelection ss = (IStructuredSelection) sel;
             _selectedNode = (TreeObject)ss.getFirstElement();
@@ -286,7 +288,9 @@ public class MBeanView extends ViewPart
             }
             
             if (parent != null && parent.getType().equals(NODE_TYPE_SERVER))
+            {
                 _server = (ManagedServer)parent.getManagedObject();
+            }
             
             _virtualHostName = _selectedNode.getVirtualHost();
         }
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
index 09a2aae522..f4bad79afa 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NotificationsTabControl.java
@@ -300,7 +300,9 @@ public class NotificationsTabControl extends VHNotificationsTabControl
         public void widgetSelected(SelectionEvent e)
         {
             if (_mbean == null)
+            {
                 return;
+            }
             
             Button source = (Button)e.getSource();
             String type = _typesCombo.getItem(_typesCombo.getSelectionIndex());
@@ -340,7 +342,9 @@ public class NotificationsTabControl extends VHNotificationsTabControl
         public void widgetSelected(SelectionEvent e)
         {
             if (_mbean == null)
+            {
                 return;
+            }
             
             Combo combo = (Combo)e.getSource();
             if (combo == _notificationNameCombo)
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
index f2fc4413cd..676389bd96 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/OperationTabControl.java
@@ -347,7 +347,9 @@ public class OperationTabControl extends TabControl
                 String str = param.getType();
                 
                 if (param.getType().lastIndexOf(".") != -1)
+                {
                     str = param.getType().substring(1 + param.getType().lastIndexOf("."));
+                }
                 
                 label = _toolkit.createLabel(_paramsComposite, "(" + str + ")");
             }
@@ -554,24 +556,38 @@ public class OperationTabControl extends TabControl
     private void clearParameterValues(Composite control)
     {
         if (control == null || (control.isDisposed()))
+        {
             return;
+        }
         
         Control[] controls = control.getChildren();
         if (controls == null || controls.length == 0)
+        {
             return;
+        }
         
         for (int i = 0; i < controls.length; i++)
         {
             if (controls[i] instanceof Combo)
+            {
                 ((Combo)controls[i]).select(0);
+            }
             if (controls[i] instanceof org.eclipse.swt.widgets.List)
+            {
                 ((org.eclipse.swt.widgets.List)controls[i]).deselectAll();
+            }
             else if (controls[i] instanceof Text)
+            {
                 ((Text)controls[i]).setText("");
+            }
             else if (controls[i] instanceof Button)
+            {
                 ((Button)controls[i]).setSelection(false);
+            }
             else if (controls[i] instanceof Composite)
+            {
                 clearParameterValues((Composite)controls[i]);
+            }
         }
     }
     
@@ -840,7 +856,9 @@ public class OperationTabControl extends TabControl
         public void keyReleased(KeyEvent e) 
         {
             if (!(e.widget instanceof Text))
+            {
                 return;
+            }
             
             Text text = (Text)e.widget;
             // Get the parameters widget and assign the text to the parameter
diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
index 43a1da17e5..10e2f78c1c 100644
--- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
+++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/ViewUtility.java
@@ -241,7 +241,9 @@ public class ViewUtility
             public void widgetSelected(SelectionEvent e)
             {
                 if (!(e.widget instanceof Button))
+                {
                     return;
+                }
 
                 Button traverseButton =(Button)e.widget; 
                 // Get the CompositeData respective to the button selected
@@ -895,7 +897,9 @@ public class ViewUtility
     public static void disposeChildren(Composite parent)
     {
         if (parent == null || parent.isDisposed())
+        {
             return;
+        }
         
         Control[] oldControls = parent.getChildren();        
         for (int i = 0; i < oldControls.length; i++)
diff --git a/java/perftests/src/main/java/org/apache/qpid/config/Connector.java b/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
index ff2377f087..81541a3260 100644
--- a/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
+++ b/java/perftests/src/main/java/org/apache/qpid/config/Connector.java
@@ -33,7 +33,10 @@ public class Connector
     ConnectionFactory getConnectionFactory(ConnectorConfig config) throws Exception
     {
         String factory = config.getFactory();
-        if(factory == null) factory = AMQConnectionFactoryInitialiser.class.getName();
+        if(factory == null)
+        {
+            factory = AMQConnectionFactoryInitialiser.class.getName();
+        }
         System.out.println("Using " + factory);
         return ((ConnectionFactoryInitialiser) Class.forName(factory).newInstance()).getFactory(config);
     }
diff --git a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java b/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
index f811704323..841fcc63ad 100644
--- a/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
+++ b/java/perftests/src/main/java/org/apache/qpid/oldtopic/Publisher.java
@@ -61,7 +61,10 @@ public class Publisher implements MessageListener
         long[] times = new long[batches];
         for(int i = 0; i < batches; i++)
         {
-            if(i > 0) Thread.sleep(delay*1000);
+            if(i > 0)
+            {
+                Thread.sleep(delay*1000);
+            }
             times[i] = batch(msgCount, consumerCount);
             System.out.println("Batch " + (i+1) + " of " + batches + " completed in " + times[i] + " ms.");
         }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 4cab7cbff4..84bd5a9635 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
@@ -170,7 +170,7 @@ public class ProducerFlowControlTest extends AbstractTestLogging
         consumerConnection.start();
 
 
-        while(consumer.receive(1000) != null);
+        while(consumer.receive(1000) != null) {};
 
         results = waitAndFindMatches("QUE-1004");