qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1560101 - in /qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src: main/java/org/apache/qpid/server/store/berkeleydb/replication/ test/java/org/apache/qpid/server/store/berkeleydb/ test/resources/
Date Tue, 21 Jan 2014 17:07:51 GMT
Author: kwall
Date: Tue Jan 21 17:07:51 2014
New Revision: 1560101

URL: http://svn.apache.org/r1560101
Log:
QPID-5409: Correct whitespace and a few other minor errors.

Removed:
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/resources/log4j.properties
Modified:
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
    qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java?rev=1560101&r1=1560100&r2=1560101&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
(original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/replication/RemoteReplicationNode.java
Tue Jan 21 17:07:51 2014
@@ -223,12 +223,12 @@ public class RemoteReplicationNode exten
         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))

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java?rev=1560101&r1=1560100&r2=1560101&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
(original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/ReplicatedEnvironmentFacadeTest.java
Tue Jan 21 17:07:51 2014
@@ -166,7 +166,6 @@ public class ReplicatedEnvironmentFacade
         }
     }
 
-    
     public void testGetName() throws Exception
     {
         assertEquals("Unexpected name", getName(), ((ReplicatedEnvironmentFacade) createMaster()).getName());
@@ -460,7 +459,7 @@ public class ReplicatedEnvironmentFacade
             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 ReplicatedEnvironmentFacade
 
         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

Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java?rev=1560101&r1=1560100&r2=1560101&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java
(original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/TestStateChangeListener.java
Tue Jan 21 17:07:51 2014
@@ -46,7 +46,7 @@ class TestStateChangeListener implements
             _latch.countDown();
         }
     }
-    
+
     public boolean awaitForStateChange(long timeout, TimeUnit timeUnit) throws InterruptedException
     {
         return _latch.await(timeout, timeUnit);



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message