From 1a6cb41e1db610d6cea249b5b33ad65cfd945b2f Mon Sep 17 00:00:00 2001 From: Pranay Dalmia Date: Wed, 23 Oct 2013 22:03:24 +0000 Subject: Adding a new TriggerManagerCapability to get the trigger manager from a repository. Also, throwing an exception in LayoutSync when the layout sync fails. --- src/main/java/com/amazon/carbonado/layout/LayoutSync.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/amazon/carbonado/layout') diff --git a/src/main/java/com/amazon/carbonado/layout/LayoutSync.java b/src/main/java/com/amazon/carbonado/layout/LayoutSync.java index ba03be3..fe60d4d 100644 --- a/src/main/java/com/amazon/carbonado/layout/LayoutSync.java +++ b/src/main/java/com/amazon/carbonado/layout/LayoutSync.java @@ -18,19 +18,15 @@ 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; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storage; import com.amazon.carbonado.Transaction; import com.amazon.carbonado.cursor.FetchAheadCursor; -import com.amazon.carbonado.cursor.FilteredCursor; /** * Synchronizes layout metadata between two repositories. Both source and @@ -121,10 +117,11 @@ 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); + throw new RepositoryException("Unable to synchronize layouts: " + src + " != " + dst); + // Same layouts, but with different generation. Create a new + // non-conflicting generation to replace both. /* createNewGen(src, dst); doAgain = true; -- cgit v1.2.3