Projects >> eucalyptus >>4e69ee90beadfb091af1d81bcc338e5a2e39d422

Chunk
Conflicting content 
      this.cluster = Clusters.lookup( Topology.lookup( ClusterController.class, allocInfo.getPartition( ) ) );
      this.messages = new StatefulMessageSet( this.cluster, State.values( ) );
      this.setupNetworkMessages( );
<<<<<<< HEAD
      this.setupVolumeMessages( );
      this.setupCredentialMessages();
=======
      this.setupVolumeMessages();
      this.updateResourceMessages( );
>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
      db.commit( );
    } catch ( final Exception e ) {
      db.rollback( );
Solution content 
      this.cluster = Clusters.lookup( Topology.lookup( ClusterController.class, allocInfo.getPartition( ) ) );
      this.messages = new StatefulMessageSet( this.cluster, State.values( ) );
      this.setupNetworkMessages( );
      this.setupVolumeMessages( );
      this.setupCredentialMessages();
      this.updateResourceMessages( );
      db.commit( );
    } catch ( final Exception e ) {
      db.rollback( );
File
ClusterAllocator.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
                                                                                                     ? this.allocInfo.getBootSet( ).getMachine( ).getPlatform( ).name( )
                                                                                                     : "linux"; // ASAP:FIXME:GRZE
    
<<<<<<< HEAD
//TODO:GRZE:FINISH THIS.    Date date = Contexts.lookup( ).getContracts( ).get( Contract.Type.EXPIRATION );
    final VmRunType.Builder builder = VmRunType.builder( );
    VmInstanceLifecycleHelpers.get( ).prepareVmRunType( childToken, builder );
    final VmRunType run = builder
=======
//TODO:GRZE:FINISH THIS.    Date date = Contexts.lookup( ).getContracts( ).get( Contract.Type.EXPIRATION ); 
    final VmRunType run = VmRunType.builder()
>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
                                   .instanceId( childToken.getInstanceId() )
                                   .naturalId( childToken.getInstanceUuid() )
                                   .keyInfo( vmKeyInfo )
Solution content 
    
                                                                                                     ? this.allocInfo.getBootSet( ).getMachine( ).getPlatform( ).name( )
                                                                                                     : "linux"; // ASAP:FIXME:GRZE
//TODO:GRZE:FINISH THIS.    Date date = Contexts.lookup( ).getContracts( ).get( Contract.Type.EXPIRATION ); 
    final VmRunType.Builder builder = VmRunType.builder( );
    VmInstanceLifecycleHelpers.get( ).prepareVmRunType( childToken, builder );
    final VmRunType run = builder
                                   .instanceId( childToken.getInstanceId( ) )
                                   .naturalId( childToken.getInstanceUuid( ) )
                                   .keyInfo( vmKeyInfo )
File
ClusterAllocator.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
                                   .naturalId( childToken.getInstanceUuid() )
                                   .keyInfo( vmKeyInfo )
                                   .launchIndex( childToken.getLaunchIndex() )
<<<<<<< HEAD
=======
                                   .networkIndex( childToken.getNetworkIndex().getIndex() )
>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
                                   .networkNames( this.allocInfo.getNetworkGroups() )
                                   .platform( platform )
                                   .reservationId( childToken.getAllocationInfo().getReservationId() )
Solution content 
                                   .keyInfo( vmKeyInfo )
                                   .launchIndex( childToken.getLaunchIndex( ) )
                                   .networkNames( this.allocInfo.getNetworkGroups( ) )
                                   .platform( platform )
File
ClusterAllocator.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                                   .platform( platform )
                                   .reservationId( childToken.getAllocationInfo().getReservationId() )
                                   .userData( this.allocInfo.getRequest().getUserData() )
<<<<<<< HEAD
                                   .credential( this.allocInfo.getCredential() )
=======
                                   .vlan( childToken.getExtantNetwork( ) != null ? childToken.getExtantNetwork().getTag( ) : new Integer(-1) )
>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
                                   .vmTypeInfo( vmInfo )
                                   .owner( this.allocInfo.getOwnerFullName( ) )
                                   .create();
Solution content 
                                   .platform( platform )
                                   .reservationId( childToken.getAllocationInfo( ).getReservationId( ) )
                                   .userData( this.allocInfo.getRequest( ).getUserData( ) )
                                   .credential( this.allocInfo.getCredential( ) )
                                   .vmTypeInfo( vmInfo )
                                   .owner( this.allocInfo.getOwnerFullName( ) )
File
ClusterAllocator.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    //ManyToOne partitions are handled differently
                                                                                                                        ? maybePartition[0]
                                                                                                                        : null )
                                                                   : null );
<<<<<<< HEAD
    ServiceConfiguration res = null;
    if(ComponentIds.lookup(compClass).isManyToOnePartition()) {
      if(partition != null) {
        res = Iterables.getFirst(ServiceConfigurations.filter(compClass, ServiceConfigurations.filterByPartition(partition)), null);
      } else {
        res = Iterables.getFirst(ServiceConfigurations.filter(compClass, ServiceConfigurations.filterEnabled()), null);
      }
    } else {
      res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( ComponentIds.lookup( compClass ), partition ) );
      if ( res == null && !compClass.equals( compId.partitionParent( ).getClass( ) ) ) {
        ServiceConfiguration parent = Topology.getInstance( ).getServices( ).get( ServiceKey.create( compId.partitionParent( ), null ) );
        Partition fakePartition = Partitions.lookupInternal( ServiceConfigurations.createEphemeral( compId, parent.getInetAddress( ) ) );
        res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( compId, fakePartition ) );
      } else if ( res == null && ( compId.isAlwaysLocal() ||
          ( BootstrapArgs.isCloudController() && compId.isCloudLocal() && !compId.isRegisterable() ) ) ) {
        res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( ServiceConfigurations.createEphemeral( compId ) ) );
=======
    ServiceConfiguration res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( ComponentIds.lookup( compClass ), partition ) );
    if ( res == null && !compClass.equals( compId.partitionParent( ).getClass( ) ) ) {
      try {
        ServiceConfiguration parent = Topology.getInstance( ).getServices( ).get( ServiceKey.create( compId.partitionParent( ), null ) );
        Partition fakePartition = Partitions.lookupInternal( ServiceConfigurations.createEphemeral( compId, parent.getInetAddress( ) ) );
        res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( compId, fakePartition ) );
      } catch ( RuntimeException e ) {//these may throw runtime exceptions and the only thing that should propage out of lookup ever is NoSuchElementException
        res = null;
>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
      }
    }
    String err = "Failed to lookup ENABLED service of type " + compClass.getSimpleName( ) + ( partition != null ? " in partition " + partition : "." );
Solution content 
                                                                                                                        ? maybePartition[0]
                                                                                                                        : null )
                                                                   : null );
    ServiceConfiguration res = null;
    //ManyToOne partitions are handled differently
    if(ComponentIds.lookup(compClass).isManyToOnePartition()) {
      if(partition != null) {
        res = Iterables.getFirst(ServiceConfigurations.filter(compClass, ServiceConfigurations.filterByPartition(partition)), null);
      } else {
        res = Iterables.getFirst(ServiceConfigurations.filter(compClass, ServiceConfigurations.filterEnabled()), null);
      }
    } else {
      res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( ComponentIds.lookup( compClass ), partition ) );
      if ( res == null && !compClass.equals( compId.partitionParent( ).getClass( ) ) ) {
        try {
          ServiceConfiguration parent = Topology.getInstance( ).getServices( ).get( ServiceKey.create( compId.partitionParent( ), null ) );
          Partition fakePartition = Partitions.lookupInternal( ServiceConfigurations.createEphemeral( compId, parent.getInetAddress( ) ) );
          res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( compId, fakePartition ) );
        } catch ( RuntimeException e ) {//these may throw runtime exceptions and the only thing that should propage out of lookup ever is NoSuchElementException
          res = null;
        }
      } else if ( res == null && ( compId.isAlwaysLocal() ||
          ( BootstrapArgs.isCloudController() && compId.isCloudLocal() && !compId.isRegisterable() ) ) ) {
        res = Topology.getInstance( ).getServices( ).get( ServiceKey.create( ServiceConfigurations.createEphemeral( compId ) ) );
      }
    }
    String err = "Failed to lookup ENABLED service of type " + compClass.getSimpleName( ) + ( partition != null ? " in partition " + partition : "." );
File
Topology.java
Developer's decision
Manual
Kind of conflict
Catch clause
Comment
If statement
Method invocation
Try statement
Variable
Chunk
Conflicting content 
package com.eucalyptus.ws;

<<<<<<< HEAD
import com.eucalyptus.auth.AuthContextSupplier;
import static com.eucalyptus.util.RestrictedTypes.findPolicyVendor;
import static com.eucalyptus.util.RestrictedTypes.getIamActionByMessageType;
=======
import java.net.SocketAddress;
>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
import java.net.URI;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
Solution content 
package com.eucalyptus.ws;

import java.net.SocketAddress;
import com.eucalyptus.auth.AuthContextSupplier;
import static com.eucalyptus.util.RestrictedTypes.findPolicyVendor;
import static com.eucalyptus.util.RestrictedTypes.getIamActionByMessageType;
import java.net.URI;
import java.util.*;
import java.util.concurrent.ConcurrentMap;
File
Handlers.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
<<<<<<< HEAD
import org.jboss.netty.handler.timeout.IdleStateEvent;
import org.jboss.netty.handler.timeout.IdleStateHandler;
import org.jboss.netty.util.HashedWheelTimer;
import com.eucalyptus.auth.Permissions;
=======

>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.binding.BindingManager;
import com.eucalyptus.bootstrap.Bootstrap;
Solution content 
import org.jboss.netty.handler.timeout.IdleStateEvent;
import org.jboss.netty.handler.timeout.IdleStateHandler;
import org.jboss.netty.util.HashedWheelTimer;

import com.eucalyptus.auth.Permissions;
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.binding.BindingManager;
import com.eucalyptus.bootstrap.Bootstrap;
File
Handlers.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        ctx.sendUpstream( e );
      }
    }
<<<<<<< HEAD
=======

>>>>>>> 7261e020bf87568a987629457f8239cfd6cb73c2
  }

  public static void addComponentHandlers( final Class componentIdClass,
Solution content 
        ctx.sendUpstream( e );
      }
    }

  }

  public static void addComponentHandlers( final Class componentIdClass,
File
Handlers.java
Developer's decision
Version 1
Kind of conflict
Blank