Projects >> eucalyptus >>382b46559c860efb3df04d178286f9285b60d8d4

Chunk
Conflicting content 
      MappingHttpRequest httpRequest = ( MappingHttpRequest ) message;
      //FIXME: newest firefox breaks...
      String userAgent = httpRequest.getHeader( "User-Agent" );
<<<<<<< HEAD
      if( userAgent != null && userAgent.matches( ".*lasticfox.*" )){
=======
      if( userAgent != null && userAgent.toLowerCase( ).contains( "elasticfox" ) ){
>>>>>>> 7c908aaf23768485304fa75ce54cedce79900270
        httpRequest.setServicePath( httpRequest.getServicePath( ).replaceAll( "Eucalyptus/", "Eucalyptus" ) );
        return true;
      }
Solution content 
      MappingHttpRequest httpRequest = ( MappingHttpRequest ) message;
      //FIXME: newest firefox breaks...
      String userAgent = httpRequest.getHeader( "User-Agent" );
      if( userAgent != null && userAgent.toLowerCase( ).contains( "elasticfox" ) ){
        httpRequest.setServicePath( httpRequest.getServicePath( ).replaceAll( "Eucalyptus/", "Eucalyptus" ) );
        return true;
      }
File
ElasticFoxPipeline.java
Developer's decision
Version 2
Kind of conflict
If statement