From 3505fce1fd46fe9aa2a35986406eaa26b00bf0c8 Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Tue, 6 Nov 2012 21:12:18 +0000
Subject: Commented out potentially destructive resync logic.

---
 src/main/java/com/amazon/carbonado/layout/LayoutSync.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/amazon/carbonado/layout/LayoutSync.java b/src/main/java/com/amazon/carbonado/layout/LayoutSync.java
index cf311e0..ba03be3 100644
--- a/src/main/java/com/amazon/carbonado/layout/LayoutSync.java
+++ b/src/main/java/com/amazon/carbonado/layout/LayoutSync.java
@@ -20,6 +20,8 @@ package com.amazon.carbonado.layout;
 
 import java.util.Arrays;
 
+import org.apache.commons.logging.LogFactory;
+
 import com.amazon.carbonado.Cursor;
 import com.amazon.carbonado.Query;
 import com.amazon.carbonado.Repository;
@@ -121,8 +123,12 @@ public class LayoutSync {
             if (src.getGeneration() != dst.getGeneration()) {
                 // Same layouts, but with different generation. Create a new
                 // non-conflicting generation to replace both.
+                LogFactory.getLog(LayoutSync.class).error
+                    ("Unable to synchronize layouts: " + src + " != " + dst);
+                /*
                 createNewGen(src, dst);
                 doAgain = true;
+                */
             }
 
             src = null;
@@ -170,6 +176,7 @@ public class LayoutSync {
         return true;
     }
 
+    /*
     private void createNewGen(StoredLayout src, StoredLayout dst) throws RepositoryException {
         long layoutID = src.getLayoutID();
         if (layoutID != dst.getLayoutID()) {
@@ -234,7 +241,9 @@ public class LayoutSync {
             dstTxn.exit();
         }
     }
+    */
 
+    /*
     private void doCreateNewGen(long now, Repository repo, long layoutID, int oldGen, int newGen)
         throws RepositoryException
     {
@@ -277,4 +286,5 @@ public class LayoutSync {
     {
         return Layout.findLayouts(repo, storableTypeName, generation);
     }
+    */
 }
-- 
cgit v1.2.3