| Chunk |
|---|
| Conflicting content |
|---|
//BodyContentUtil.flushAndPop(pc,bc);
throw Caster.toPageException(t);
}
<<<<<<< HEAD
if(!getOutput()) {
if(bufferOutput)BodyContentUtil.clearAndPop(pc,bc);
else if(!wasSilent)pc.unsetSilent();
}
//BodyContentUtil.clearAndPop(pc,bc);
=======
BodyContentUtil.clearAndPop(pc,bc);
>>>>>>> 9941e4bcbee5c90e4f56486cdfb4085a138262a0
if(properties.returnType==CFTypes.TYPE_ANY) return returnValue;
else if(Decision.isCastableTo(properties.strReturnType,returnValue,false,false,-1)) return returnValue; |
| Solution content |
|---|
//BodyContentUtil.flushAndPop(pc,bc);
throw Caster.toPageException(t);
}
if(!getOutput()) {
if(bufferOutput)BodyContentUtil.clearAndPop(pc,bc);
else if(!wasSilent)pc.unsetSilent();
}
//BodyContentUtil.clearAndPop(pc,bc);
if(properties.returnType==CFTypes.TYPE_ANY) return returnValue;
else if(Decision.isCastableTo(properties.strReturnType,returnValue,false,false,-1)) return returnValue; |
| File |
|---|
| UDFImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |