Projects >> beanstalker >>b77a4d6295ff5f6a2693317a5fb9ef7f2d6baa36

Chunk
Conflicting content
// Best Guess Evar
public class ReplaceEnvironmentMojo extends CreateEnvironmentMojo {

<<<<<<< HEAD
  /**
   * Pattern for Increasing in Replace Environment
   */
  private static final Pattern PATTERN_NUMBERED = Pattern
      .compile("^(.*)-(\\d+)$");

  /**
   * Max Environment Name Length
   */
  private static final int MAX_ENVNAME_LEN = 23;

  /**
   * Minutes until timeout
   */
  @Parameter(property = "beanstalk.timeoutMins", defaultValue = "20")
  Integer timeoutMins;

  /**
   * Skips if Same Version?
   */
  @Parameter(property = "beanstalk.skipIfSameVersion", defaultValue = "true")
  boolean skipIfSameVersion = true;

  /**
   * Max Number of Attempts (for cnameSwap in Particular)
   */
  @Parameter(property = "beanstalk.maxAttempts", defaultValue = "15")
  Integer maxAttempts = 15;

  /**
   * Do a 'Mock' Terminate Environment Call (useful for Debugging)
   */
  @Parameter(property = "beanstalk.mockTerminateEnvironment", defaultValue = "false")
  boolean mockTerminateEnvironment = false;

  /**
   * Retry Interval, in Seconds
   */
  @Parameter(property = "beanstalk.attemptRetryInterval", defaultValue = "60")
  int attemptRetryInterval = 60;

  /**
   * 

List of R53 Domains

* *

Could be set as either:

  • fqdn:hostedZoneId (e.g. "services.modafocas.org:Z3DJ4DL0DIEEJA")
  • *
  • hosted zone name - will be set to root. (e.g., "modafocas.org")
*/ @Parameter(property = "beanstalk.domains") String[] domains; @Override protected EnvironmentDescription handleResults( Collection environments) throws MojoExecutionException { // Don't care - We're an exception to the rule, you know. return null; } @Override protected Object executeInternal() throws AbstractMojoExecutionException { ======= /** * Retry Interval, in Seconds */ @Parameter(property = "beanstalk.attemptRetryInterval", defaultValue = "60") int attemptRetryInterval = 60; /** * Whether or not to copy option settings from old environment when replacing */ @Parameter(property = "beanstalk.copyOptionSettings", defaultValue = "true") boolean copyOptionSettings = true; @Override protected EnvironmentDescription handleResults( Collection environments) throws MojoExecutionException { // Don't care - We're an exception to the rule, you know. return null; } @Override protected Object executeInternal() throws AbstractMojoExecutionException { >>>>>>> d06885548c39c9f51a1a108c0720174dc4f82300 /* * Is the desired cname not being used by other environments? If so, * just launch the environment
Solution content
// Best Guess Evar
public class ReplaceEnvironmentMojo extends CreateEnvironmentMojo {
  /**
   * Pattern for Increasing in Replace Environment
   */
  private static final Pattern PATTERN_NUMBERED = Pattern
      .compile("^(.*)-(\\d+)$");

  /**
   * Max Environment Name Length
   */
  private static final int MAX_ENVNAME_LEN = 23;

  /**
   * Minutes until timeout
   */
  @Parameter(property = "beanstalk.timeoutMins", defaultValue = "20")
  Integer timeoutMins;

  /**
   * Skips if Same Version?
   */
  @Parameter(property = "beanstalk.skipIfSameVersion", defaultValue = "true")
  boolean skipIfSameVersion = true;

  /**
   * Max Number of Attempts (for cnameSwap in Particular)
   */
  @Parameter(property = "beanstalk.maxAttempts", defaultValue = "15")
  Integer maxAttempts = 15;

  /**
   * Do a 'Mock' Terminate Environment Call (useful for Debugging)
   */
  @Parameter(property = "beanstalk.mockTerminateEnvironment", defaultValue = "false")
  boolean mockTerminateEnvironment = false;

  /**
   * Retry Interval, in Seconds
   */
  @Parameter(property = "beanstalk.attemptRetryInterval", defaultValue = "60")
  int attemptRetryInterval = 60;

  /**
   * 

List of R53 Domains

* *

Could be set as either:

  • fqdn:hostedZoneId (e.g. "services.modafocas.org:Z3DJ4DL0DIEEJA")
  • *
  • hosted zone name - will be set to root. (e.g., "modafocas.org")
*/ @Parameter(property = "beanstalk.domains") String[] domains; /** * Whether or not to copy option settings from old environment when replacing */ @Parameter(property = "beanstalk.copyOptionSettings", defaultValue = "true") boolean copyOptionSettings = true; @Override protected EnvironmentDescription handleResults( Collection environments) throws MojoExecutionException { // Don't care - We're an exception to the rule, you know. return null; } @Override protected Object executeInternal() throws AbstractMojoExecutionException { /* * Is the desired cname not being used by other environments? If so, * just launch the environment
File
ReplaceEnvironmentMojo.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Comment
Method declaration
Method invocation
Method signature
Chunk
Conflicting content
          + ".elasticbeanstalk.com");
    }

<<<<<<< HEAD
    copyOptionSettings(curEnv);
=======
        if(copyOptionSettings) {
            copyOptionSettings(curEnv);
        }
>>>>>>> d06885548c39c9f51a1a108c0720174dc4f82300

    if (!solutionStack.equals(curEnv.getSolutionStackName())) {
      if (getLog().isInfoEnabled()) {
Solution content
          + ".elasticbeanstalk.com");
    }

        if(copyOptionSettings) {
            copyOptionSettings(curEnv);
        }

    if (!solutionStack.equals(curEnv.getSolutionStackName())) {
      if (getLog().isInfoEnabled()) {
File
ReplaceEnvironmentMojo.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation