| Chunk |
|---|
| Conflicting content |
|---|
}
}
<<<<<<< HEAD
=======
@Override
public void close()
{
// TODO Auto-generated method stub
}
@Override
public Iterator iterate()
{
// TODO Auto-generated method stub
return null;
}
>>>>>>> 79518b17c012bceae3331c33f1ad5122780be860
} |
| Solution content |
|---|
}
}
@Override
public void close()
{
// TODO Auto-generated method stub
}
@Override
public Iterator iterate()
{
EntityMetadata m = getEntityMetadata();
externalProperties = ((CassandraClientBase) persistenceDelegeator.getClient(m)).getExternalProperties();
if (!MetadataUtils.useSecondryIndex(m.getPersistenceUnit()))
{
throw new UnsupportedOperationException("Scrolling over hbase is unsupported for lucene queries");
}
return new ResultIterator(this, m, persistenceDelegeator.getClient(m), this.getReader(), getFetchSize() !=null ? getFetchSize() : this.maxResult);
}
void setRelationalEntities(List enhanceEntities, Client client, EntityMetadata m)
{
super.setRelationEntities(enhanceEntities, client, m);
}
} |
| File |
|---|
| CassQuery.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
}
<<<<<<< HEAD
}
=======
}
>>>>>>> 79518b17c012bceae3331c33f1ad5122780be860 |
| Solution content |
|---|
}
} |
| File |
|---|
| PolygonTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Other |