Projects >> Kundera >>0e1b5e50f5f7a5d178ddb38c898d2ef81ae12c9f

Chunk
Conflicting content 
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.thrift.CounterColumn;
import org.apache.cassandra.thrift.CounterSuperColumn;
<<<<<<< HEAD
import org.apache.cassandra.thrift.CqlResult;
import org.apache.cassandra.thrift.CqlRow;
=======
>>>>>>> 24c7a58479299792a7b1735667532e44b83fba18
import org.apache.cassandra.thrift.IndexClause;
import org.apache.cassandra.thrift.IndexExpression;
import org.apache.cassandra.thrift.IndexOperator;
Solution content 
import org.apache.cassandra.thrift.ColumnPath;
import org.apache.cassandra.thrift.CounterColumn;
import org.apache.cassandra.thrift.CounterSuperColumn;
import org.apache.cassandra.thrift.IndexClause;
import org.apache.cassandra.thrift.IndexExpression;
import org.apache.cassandra.thrift.IndexOperator;
File
ThriftClient.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
            String columnName, Field member)
    {
        String fieldName = null;
<<<<<<< HEAD
        if (metadata.getRelationNames() == null || !metadata.getRelationNames().contains(columnName))
=======
        // Field member=null;
        if (metadata != null && (metadata.getRelationNames() == null || !metadata.getRelationNames().contains(columnName)))
>>>>>>> 24c7a58479299792a7b1735667532e44b83fba18
        {
            if (!columnName.equals(((AbstractAttribute) metadata.getIdAttribute()).getJPAColumnName()))
            {
Solution content 
            String columnName, Field member)
    {
        String fieldName = null;
        // Field member=null;
        if (metadata != null
                && (metadata.getRelationNames() == null || !metadata.getRelationNames().contains(columnName)))
        {
            if (!columnName.equals(((AbstractAttribute) metadata.getIdAttribute()).getJPAColumnName()))
            {
File
DSClientUtilities.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement