| Chunk |
|---|
| Conflicting content |
|---|
public SetResponse findRecords( Name name, int type ) {
if( StackConfiguration.USE_INSTANCE_DNS && name.toString( ).matches("euca-.+{3}-.+{3}-.+{3}-.+{3}\\..*") ) {
try {
<<<<<<< HEAD
String[] tryIp = name.toString( ).replaceAll( "euca-", "" ).replaceAll(VmInstances.INSTANCE_SUBDOMAIN + ".*","").split("-");
=======
if(type == Type.AAAA)
return(SetResponse.ofType(SetResponse.SUCCESSFUL));
String[] tryIp = name.toString( ).replaceAll( "euca-", "" ).replaceAll("\\.eucalyptus.*","").split("-");
>>>>>>> 96e74ed5e5999633eeb77e52e9ac074aa7bb6dfa
if( tryIp.length < 4 ) return super.findRecords( name, type );
String ipCandidate = new StringBuffer()
.append(tryIp[0]).append(".") |
| Solution content |
|---|
public SetResponse findRecords( Name name, int type ) {
if( StackConfiguration.USE_INSTANCE_DNS && name.toString( ).matches("euca-.+{3}-.+{3}-.+{3}-.+{3}\\..*") ) {
try {
if(type == Type.AAAA)
return(SetResponse.ofType(SetResponse.SUCCESSFUL));
String[] tryIp = name.toString( ).replaceAll( "euca-", "" ).replaceAll(VmInstances.INSTANCE_SUBDOMAIN + ".*","").split("-");
if( tryIp.length < 4 ) return super.findRecords( name, type );
String ipCandidate = new StringBuffer()
.append(tryIp[0]).append(".") |
| File |
|---|
| TransientZone.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |