QPID-5409: Correct whitespace and a few other minor errors.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-bdb-ha@1560101 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 4 insertions, 35 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
index 3622196eca..06fffddc0a 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
@@ -223,12 +223,12 @@ public class RemoteReplicationNode extends AbstractAdapter implements Replicatio
         catch (IOException e)
         {
             _role = com.sleepycat.je.rep.ReplicatedEnvironment.State.UNKNOWN.name();
-            //LOGGER.warn("Cannot connect to node " + _replicationNode.getName() + " from " + _groupName, e);
+            LOGGER.warn("Cannot connect to node " + _replicationNode.getName() + " from " + _groupName, e);
         }
         catch (ServiceConnectFailedException e)
         {
             _role = com.sleepycat.je.rep.ReplicatedEnvironment.State.UNKNOWN.name();
-            //LOGGER.warn("Cannot retrieve the node details for node " + _replicationNode.getName() + " from " + _groupName, e);
+            LOGGER.warn("Cannot retrieve the node details for node " + _replicationNode.getName() + " from " + _groupName, e);
         }
 
         if (!_role.equals(oldRole))
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
index 4d7d7a357c..8b4cd27967 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
@@ -166,7 +166,6 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase
         }
     }
 
-    
     public void testGetName() throws Exception
     {
         assertEquals("Unexpected name", getName(), ((ReplicatedEnvironmentFacade) createMaster()).getName());
@@ -460,7 +459,7 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase
             Thread.sleep(200);
         }
 
-        assertTrue("The node could not rejoin the cluster. State is " + master.getNodeState(), 
+        assertTrue("The node could not rejoin the cluster. State is " + master.getNodeState(),
                 State.REPLICA.name().equals(master.getNodeState()) || State.MASTER.name().equals(master.getNodeState()) );
 
         Environment e2 = master.getEnvironment();
@@ -514,9 +513,6 @@ public class ReplicatedEnvironmentFacadeTest extends QpidTestCase
 
         assertEquals("Node made master an unexpected number of times", 1, masterStateChangeCount.get());
         assertEquals("Node made unknown an unexpected number of times", 1, unknownStateChangeCount.get());
-        
-        // restart other nodes
-        // check state of node 1 is either MASTER or REPLICA
     }
 
     public void testCloseStateTransitions() throws Exception
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java
index 1327c777d9..5b5a507c1f 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java
@@ -46,7 +46,7 @@ class TestStateChangeListener implements StateChangeListener
             _latch.countDown();
         }
     }
-    
+
     public boolean awaitForStateChange(long timeout, TimeUnit timeUnit) throws InterruptedException
     {
         return _latch.await(timeout, timeUnit);
diff --git a/qpid/java/bdbstore/src/test/resources/log4j.properties b/qpid/java/bdbstore/src/test/resources/log4j.properties
deleted file mode 100644
index 8b70c4eff7..0000000000
--- a/qpid/java/bdbstore/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-log4j.rootLogger=ERROR,console
-
-log4j.logger.org.apache.qpid=DEBUG
-
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.Threshold=all
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-
-log4j.appender.console.layout.ConversionPattern=%d %p [%t] [%c{1}] %m%n