usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From toddn...@apache.org
Subject [28/39] incubator-usergrid git commit: test fixes
Date Sun, 10 May 2015 11:00:21 GMT
test fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c1ae796d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c1ae796d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c1ae796d

Branch: refs/heads/USERGRID-614
Commit: c1ae796d4f77eac3c94e7a691e2ed46ce3e73053
Parents: d0c033c
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Thu May 7 10:43:52 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Thu May 7 10:43:52 2015 -0600

----------------------------------------------------------------------
 .../core/migration/schema/MigrationManagerImpl.java     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c1ae796d/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
index 2fb32d2..31aa1b3 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/schema/MigrationManagerImpl.java
@@ -24,7 +24,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -114,14 +113,11 @@ public class MigrationManagerImpl implements MigrationManager {
             return;
         }
 
-        try {
-            keyspace.createColumnFamily(columnFamily.getColumnFamily(), columnFamily.getOptions());
-            logger.info("Created column family {}", columnFamily.getColumnFamily().getName());
-            waitForMigration();
-        }catch (ConnectionException e){
-            logger.error("Failed to create column family "+columnFamily.getColumnFamily().getName(),e);
-        }
+        keyspace.createColumnFamily( columnFamily.getColumnFamily(), columnFamily.getOptions()
);
 
+        logger.info( "Created column family {}", columnFamily.getColumnFamily().getName()
);
+
+        waitForMigration();
     }
 
 


Mime
View raw message