natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Aleksey Yeschenko 2014-11-15 00:07:16 +03:00
parent cbbc1191ce 1b21aef815
commit 3ad82c730e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -857,7 +857,7 @@ public final class CFMetaData
{
className = className.contains(".") ? className : "org.apache.cassandra.db.compaction." + className;
Class<AbstractCompactionStrategy> strategyClass = FBUtilities.classForName(className, "compaction strategy");
if (strategyClass.equals(WrappingCompactionStrategy.class))
if (className.equals(WrappingCompactionStrategy.class.getName()))
throw new ConfigurationException("You can't set WrappingCompactionStrategy as the compaction strategy!");
if (!AbstractCompactionStrategy.class.isAssignableFrom(strategyClass))
throw new ConfigurationException(String.format("Specified compaction strategy class (%s) is not derived from AbstractReplicationStrategy", className));
@ -869,10 +869,8 @@ public final class CFMetaData
{
try
{
Constructor<? extends AbstractCompactionStrategy> constructor = compactionStrategyClass.getConstructor(new Class[] {
ColumnFamilyStore.class,
Map.class // options
});
Constructor<? extends AbstractCompactionStrategy> constructor =
compactionStrategyClass.getConstructor(ColumnFamilyStore.class, Map.class);
return constructor.newInstance(cfs, compactionStrategyOptions);
}
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | InstantiationException e)