Projects >> eucalyptus >>daac1128412bba7123aad552d93b39d39e9cb5ea

Chunk
Conflicting content 
    ServiceBuilder builder = builders.get( request.getClass( ) );
    LOG.info( "Using builder: " + builder.getClass( ).getSimpleName( ) + " for: " + name + "@" + hostName + ":" + port );
    if( !builder.checkAdd( name, hostName, port ) ) {
<<<<<<< HEAD
      LOG.info( builder.getClass( ).getSimpleName( ) + ": checkAdd failed." );
=======
      reply.set_return(true);
>>>>>>> 9da84c5e8415154c52b9c9bbdf1ec21b781e2fa0
      return reply;
    }
    try {
Solution content 
    ServiceBuilder builder = builders.get( request.getClass( ) );
    LOG.info( "Using builder: " + builder.getClass( ).getSimpleName( ) + " for: " + name + "@" + hostName + ":" + port );
    if( !builder.checkAdd( name, hostName, port ) ) {
      LOG.info( builder.getClass( ).getSimpleName( ) + ": checkAdd failed." );
      return reply;
    }
    try {
File
Configuration.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
  
  void clear( ) {
    EventRecord.caller( Context.class, EventType.CONTEXT_CLEAR, this.correlationId, this.channel.toString( ) ).debug( );
<<<<<<< HEAD
    this.muleEvent.clear( );
    this.muleEvent = null;
=======
    this.channel = null;
    this.httpRequest = null;
    if( this.muleEvent != null ) {
      this.muleEvent.clear( );
      this.muleEvent = null;
    }
>>>>>>> 9da84c5e8415154c52b9c9bbdf1ec21b781e2fa0
  }
  
  private final static  TYPE check( final TYPE obj ) {
Solution content 
  
  void clear( ) {
    EventRecord.caller( Context.class, EventType.CONTEXT_CLEAR, this.correlationId, this.channel.toString( ) ).debug( );
    this.muleEvent.clear( );
    this.muleEvent = null;
  }
  
  private final static  TYPE check( final TYPE obj ) {
File
Context.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
      try {
        final Component comp = safeLookupComponent( component.getComponent( ) );
        URI uri = comp.getUri( localAddr.getHostName( ), 8773 );
<<<<<<< HEAD
        ServiceConfiguration config = new BogoConfig( comp.getPeer( ), comp.getName( ), uri.getHost( ), 8773, uri.getPath( ) );
=======
        ServiceConfiguration config = new BogoConfig( comp.getPeer( ), comp.getName( ), uri.getHost( ), 8773, uri.getPath( ) );        
>>>>>>> 9da84c5e8415154c52b9c9bbdf1ec21b781e2fa0
        System.setProperty( "euca." + component.getComponent( ) + ".name", component.getName( ) );
        comp.buildService( config );
        initializedComponents.add( component.getComponent( ) );
Solution content 
      try {
        final Component comp = safeLookupComponent( component.getComponent( ) );
        URI uri = comp.getUri( localAddr.getHostName( ), 8773 );
        ServiceConfiguration config = new BogoConfig( comp.getPeer( ), comp.getName( ), uri.getHost( ), 8773, uri.getPath( ) );
        System.setProperty( "euca." + component.getComponent( ) + ".name", component.getName( ) );
        comp.buildService( config );
        initializedComponents.add( component.getComponent( ) );
File
HeartbeatHandler.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
          String resp = "";
          for ( Component c : Components.list( ) ) {
            resp += String.format( "name=%-20.20s enabled=%-10.10s local=%-10.10s initialized=%-10.10s\n", c.getName( ), c.isEnabled( ), c.isLocal( ),
<<<<<<< HEAD
                                   c.isRunning( ) );
=======
                                   c.isInitialized( ) );
>>>>>>> 9da84c5e8415154c52b9c9bbdf1ec21b781e2fa0
          }
          ChannelBuffer buf = ChannelBuffers.copiedBuffer( resp.getBytes( ) );
          response.setContent( buf );
Solution content 
          String resp = "";
          for ( Component c : Components.list( ) ) {
            resp += String.format( "name=%-20.20s enabled=%-10.10s local=%-10.10s initialized=%-10.10s\n", c.getName( ), c.isEnabled( ), c.isLocal( ),
                                   c.isRunning( ) );
          }
          ChannelBuffer buf = ChannelBuffers.copiedBuffer( resp.getBytes( ) );
          response.setContent( buf );
File
HeartbeatHandler.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.mule.transport.NullPayload;

import com.eucalyptus.context.Contexts;
<<<<<<< HEAD
=======
import com.eucalyptus.context.NoSuchContextException;
>>>>>>> 9da84c5e8415154c52b9c9bbdf1ec21b781e2fa0
import com.eucalyptus.context.ServiceContext;
import com.eucalyptus.http.MappingHttpRequest;
import com.eucalyptus.ws.stages.UnrollableStage;
Solution content 
import org.mule.transport.NullPayload;

import com.eucalyptus.context.Contexts;
import com.eucalyptus.context.ServiceContext;
import com.eucalyptus.http.MappingHttpRequest;
import com.eucalyptus.ws.stages.UnrollableStage;
File
MetadataPipeline.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        newUri = uri.replaceAll( "/\\d\\d\\d\\d-\\d\\d-\\d\\d/", remoteHost + ":" );

      HttpResponse response = null;
<<<<<<< HEAD
      LOG.trace( "Trying to get metadata: " + newUri );
=======
      LOG.info( "Trying to get metadata: " + newUri );
>>>>>>> 9da84c5e8415154c52b9c9bbdf1ec21b781e2fa0
      Object reply = null;
      try {
        reply = ServiceContext.send( "VmMetadata", newUri );
Solution content 
        newUri = uri.replaceAll( "/\\d\\d\\d\\d-\\d\\d-\\d\\d/", remoteHost + ":" );

      HttpResponse response = null;
      LOG.trace( "Trying to get metadata: " + newUri );
      Object reply = null;
      try {
        reply = ServiceContext.send( "VmMetadata", newUri );
File
MetadataPipeline.java
Developer's decision
Version 1
Kind of conflict
Method invocation