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

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

9 files changed, 47 insertions, 9 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
index bc832cf570..0886ae2ae0 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersBinding.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
index ad9d2e6aca..10d7503800 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
index dc462f1d40..3be28036aa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
index 79d3ab5bd0..05141a48a1 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
index 18386def06..035645acc7 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
index 7336f4f8f6..1c18887f4d 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectProperties.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
index 3a3a88e1b3..6b2dff7165 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/AssignedSubscriptionMessageGroupManager.java
+++ b/qpid/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/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
index e7b4dd7a37..62e94f6f2e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/DefinedGroupMessageGroupManager.java
+++ b/qpid/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/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
index 28a1b2d9f2..8fc921822c 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/CurrentActorTest.java
+++ b/qpid/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)
             {