svn commit: r1705218 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

[rakeshr]

Author: rakeshr
Date: Fri Sep 25 06:30:38 2015
New Revision: 1705218

URL: http://svn.apache.org/viewvc?rev=1705218&view=rev
Log:
ZOOKEEPER-2279: QuorumPeer loadDataBase() error message is incorrect(Arshad 
Mohammad via rakeshr)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1705218&r1=1705217&r2=1705218&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Sep 25 06:30:38 2015
@@ -120,6 +120,9 @@ BUGFIXES:
   ZOOKEEPER-1506: Re-try DNS hostname -> IP resolution if node connection
   fails (Robert Thille via fpj)
 
+  ZOOKEEPER-2279: QuorumPeer loadDataBase() error message is incorrect
+  (Arshad Mohammad via rakeshr)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for

Modified: 
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
URL: 
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=1705218&r1=1705217&r2=1705218&view=diff
==============================================================================
--- 
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
 (original)
+++ 
zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
 Fri Sep 25 06:30:38 2015
@@ -551,7 +551,7 @@ public class QuorumPeer extends ZooKeepe
                writeLongToFile(ACCEPTED_EPOCH_FILENAME, acceptedEpoch);
             }
             if (acceptedEpoch < currentEpoch) {
-               throw new IOException("The current epoch, " + 
ZxidUtils.zxidToString(currentEpoch) + " is less than the accepted epoch, " + 
ZxidUtils.zxidToString(acceptedEpoch));
+               throw new IOException("The accepted epoch, " + 
ZxidUtils.zxidToString(acceptedEpoch) + " is less than the current epoch, " + 
ZxidUtils.zxidToString(currentEpoch));
             }
         } catch(IOException ie) {
             LOG.error("Unable to load database on disk", ie);