Projects >> eucalyptus >>9e691932fa15e900e18a4d9ec14c5e9fa5cb6940

Chunk
Conflicting content 
    super( );
  }
  
  VmBootRecord( BootableSet bootSet, byte[] userData, SshKeyPair sshKeyPair, VmType vmType ) {
<<<<<<< HEAD
    checkParam( "Bootset must not be null", bootSet, notNullValue() );
    this.machineImage = ( ImageInfo ) bootSet.getMachine( );
    if ( bootSet.hasKernel( ) )
=======
    assertThat( "Bootset must not be null", bootSet, notNullValue( ) );
    if ( bootSet.getMachine() instanceof ImageInfo ) {
      this.machineImage = ( ImageInfo ) bootSet.getMachine( );
    }
    if ( bootSet.hasKernel( ) ) {
>>>>>>> 25d24cad956fbf5ed4a7e1bbb835d1a8a07f5f39
      this.kernel = bootSet.getKernel( );
    }
    if ( bootSet.hasRamdisk( ) ) {
Solution content 
  }
  
  VmBootRecord( BootableSet bootSet, byte[] userData, SshKeyPair sshKeyPair, VmType vmType ) {
    checkParam( "Bootset must not be null", bootSet, notNullValue( ) );
    if ( bootSet.getMachine() instanceof ImageInfo ) {
      this.machineImage = ( ImageInfo ) bootSet.getMachine( );
    }
    if ( bootSet.hasKernel( ) ) {
      this.kernel = bootSet.getKernel( );
    }
    if ( bootSet.hasRamdisk( ) ) {
File
VmBootRecord.java
Developer's decision
Combination
Kind of conflict
Attribute
Cast expression
If statement
Method invocation
Chunk
Conflicting content 
                        final String accountId,
                        final String accountName,
                        final EventActionInfo actionInfo) {
<<<<<<< HEAD
    checkParam( uuid, not( isEmptyOrNullString() ) );
    checkParam( address, not( isEmptyOrNullString() ) );
    checkParam( userId, not( isEmptyOrNullString() ) );
    checkParam( userName, not( isEmptyOrNullString() ) );
    checkParam( accountId, not( isEmptyOrNullString() ) );
    checkParam( accountName, not( isEmptyOrNullString() ) );
    checkParam( actionInfo, notNullValue() );
=======
    assertThat( address, not(isEmptyOrNullString()) );
    assertThat( userId, not(isEmptyOrNullString()) );
    assertThat( userName, not(isEmptyOrNullString()) );
    assertThat( accountId, not(isEmptyOrNullString()) );
    assertThat( accountName, not(isEmptyOrNullString()) );
    assertThat(actionInfo, notNullValue() );
>>>>>>> 25d24cad956fbf5ed4a7e1bbb835d1a8a07f5f39

    this.address = address;
    this.userId = userId;
Solution content 
                        final String accountId,
                        final String accountName,
                        final EventActionInfo actionInfo) {
    checkParam( address, not(isEmptyOrNullString()) );
    checkParam( userId, not(isEmptyOrNullString()) );
    checkParam( userName, not(isEmptyOrNullString()) );
    checkParam( accountId, not(isEmptyOrNullString()) );
    checkParam( accountName, not(isEmptyOrNullString()) );
    checkParam( actionInfo, notNullValue() );

    this.address = address;
    this.userId = userId;
File
AddressEvent.java
Developer's decision
Combination
Kind of conflict
Method invocation