svn commit: r1312034 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java

[fp...@apache.org]

Author: fpj
Date: Tue Apr 10 23:05:23 2012
New Revision: 1312034

URL: http://svn.apache.org/viewvc?rev=1312034&view=rev
Log:
BOOKKEEPER-200: Fix format and comments (fpj)


Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1312034&r1=1312033&r2=1312034&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Apr 10 23:05:23 2012
@@ -82,6 +82,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-211: Bookie fails to to start (sijie)
 
+	BOOKKEEPER-200: Fix format and comments (fpj)
+
       hedwig-server/
       
         BOOKKEEPER-140: Hub server doesn't subscribe remote region correctly when a region is down. (Sijie Gou via ivank)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java?rev=1312034&r1=1312033&r2=1312034&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerHandle.java Tue Apr 10 23:05:23 2012
@@ -700,7 +700,7 @@ public class LedgerHandle {
                                             writeLedgerConfig(new ChangeEnsembleCb(), null);
                                             return;
                                         } else {
-                                            LOG.error("Could not resolve ledger metadata confliction while changing ensemble to: "
+                                            LOG.error("Could not resolve ledger metadata conflict while changing ensemble to: "
                                                       + newEnsemble + ", old meta data is \n" + new String(metadata.serialize())
                                                       + "\n, new meta data is \n" + new String(newMeta.serialize()) + "\n ,closing ledger");
                                             handleUnrecoverableErrorDuringAdd(BKException.Code.ZKException);

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java?rev=1312034&r1=1312033&r2=1312034&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/LedgerMetadata.java Tue Apr 10 23:05:23 2012
@@ -266,11 +266,14 @@ public class LedgerMetadata {
      *
      * @param newMeta
      *          Re-read metadata
-     * @return true if the confliction is resolved, otherwise false.
+     * @return true if the conflict has been resolved, otherwise false.
      */
     boolean resolveConflict(LedgerMetadata newMeta) {
-        // length & close is changed means other one open the ledger
-        // can't resolve this confliction
+        /*
+         *  if length & close have changed, then another client has
+         *  opened the ledger, can't resolve this conflict.
+         */
+
         if (metadataFormatVersion != newMeta.metadataFormatVersion ||
             ensembleSize != newMeta.ensembleSize ||
             quorumSize != newMeta.quorumSize ||
@@ -298,7 +301,10 @@ public class LedgerMetadata {
                 return false;
             }
         }
-        // if the confliction could be resolved, update ensembles and znode version
+        /*
+         *  if the conflict has been resolved, then update
+         *  ensemble and znode version
+         */
         ensembles = newMeta.ensembles;
         znodeVersion = newMeta.znodeVersion;
         return true;