Projects >> hudson >>1203b091902526620775a3e3603a245b81ed46b4

Chunk
Conflicting content 
import org.apache.commons.jexl.parser.ASTSizeFunction;
import org.apache.commons.jexl.util.Introspector;
import org.apache.commons.lang.StringUtils;
<<<<<<< HEAD
import org.jenkins.ui.icon.IconSet;
=======
import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
import org.jvnet.tiger_types.Types;
import org.kohsuke.stapler.Ancestor;
import org.kohsuke.stapler.Stapler;
Solution content 
import org.apache.commons.jexl.parser.ASTSizeFunction;
import org.apache.commons.jexl.util.Introspector;
import org.apache.commons.lang.StringUtils;
import org.jenkins.ui.icon.IconSet;
import org.jvnet.tiger_types.Types;
import org.kohsuke.stapler.Ancestor;
import org.kohsuke.stapler.Stapler;
File
Functions.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
<<<<<<< HEAD
import hudson.util.RunList;
import java.util.concurrent.atomic.AtomicLong;
import org.kohsuke.accmod.Restricted;
=======
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.DoNotUse;
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
import org.kohsuke.accmod.restrictions.NoExternalUse;

/**
Solution content 
import com.google.common.base.Predicates;
import hudson.util.RunList;
import java.util.concurrent.atomic.AtomicLong;

import com.google.common.base.Predicate;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;

/**
File
Functions.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            }

            // try to reflect the changes by reloading
<<<<<<< HEAD
            new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
            Items.whileUpdatingByXml(new Callable() {
                @Override public Void call() throws IOException {
                    onLoad(getParent(), getRootDir().getName());
                    return null;
                }
            });
=======
            Object o = new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
            if (o!=this) {
                // ensure that we've got the same job type. extending this code to support updating
                // to different job type requires destroying & creating a new job type
                throw new IOException("Expecting "+this.getClass()+" but got "+o.getClass()+" instead");
            }

            Items.updatingByXml.set(true);
            try {
                onLoad(getParent(), getRootDir().getName());
            } finally {
                Items.updatingByXml.set(false);
            }
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
            Jenkins.getInstance().rebuildDependencyGraphAsync();

            // if everything went well, commit this new version
Solution content 
            }

            // try to reflect the changes by reloading
            Object o = new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
            if (o!=this) {
                // ensure that we've got the same job type. extending this code to support updating
                // to different job type requires destroying & creating a new job type
                throw new IOException("Expecting "+this.getClass()+" but got "+o.getClass()+" instead");
            }
            Items.whileUpdatingByXml(new Callable() {
                @Override public Void call() throws IOException {
                    onLoad(getParent(), getRootDir().getName());
                    return null;
                }
            });
            Jenkins.getInstance().rebuildDependencyGraphAsync();

            // if everything went well, commit this new version
File
AbstractItem.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Try statement
Variable
Chunk
Conflicting content 
 */
package hudson.security;

<<<<<<< HEAD
import javax.annotation.Nonnull;
=======
import hudson.remoting.Callable;
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
import jenkins.security.NonSerializableSecurityContext;
import jenkins.model.Jenkins;
import org.acegisecurity.AccessDeniedException;
Solution content 
 */
package hudson.security;

import javax.annotation.Nonnull;
import hudson.remoting.Callable;
import jenkins.security.NonSerializableSecurityContext;
import jenkins.model.Jenkins;
import org.acegisecurity.AccessDeniedException;
File
ACL.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
                        implicitCollectionsForCurrentObject = writeValueToImplicitCollection(context, value, implicitCollectionsForCurrentObject, result, fieldName);
                    }
                }
<<<<<<< HEAD
            } catch (XStreamException e) {
                if (critical) {
                    throw e;
                }
                addErrorInContext(context, e);
            } catch (LinkageError e) {
                if (critical) {
                    throw e;
                }
=======
            } catch (MissingFieldException e) {
                LOGGER.log(FINE, "Skipping a non-existent field " + e.getFieldName(), e);
                addErrorInContext(context, e);
            } catch (CannotResolveClassException e) {
                LOGGER.log(FINE, "Skipping a non-existent type", e);
                addErrorInContext(context, e);
            } catch (LinkageError e) {
                LOGGER.log(FINE, "Failed to resolve a type", e);
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
                addErrorInContext(context, e);
            }
Solution content 
                        implicitCollectionsForCurrentObject = writeValueToImplicitCollection(context, value, implicitCollectionsForCurrentObject, result, fieldName);
                    }
                }
            } catch (XStreamException e) {
                if (critical) {
                    throw e;
                }
                addErrorInContext(context, e);
            } catch (LinkageError e) {
                if (critical) {
                    throw e;
                }
                addErrorInContext(context, e);
            }
File
RobustReflectionConverter.java
Developer's decision
Version 1
Kind of conflict
Catch clause
If statement
Method invocation
Chunk
Conflicting content 
        }

        public Page goTo(String relative, String expectedContentType) throws IOException, SAXException {
<<<<<<< HEAD
            while (relative.startsWith("/")) relative = relative.substring(1);
=======
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
            Page p;
            try {
                p = super.getPage(getContextPath() + relative);
Solution content 
        }

        public Page goTo(String relative, String expectedContentType) throws IOException, SAXException {
            while (relative.startsWith("/")) relative = relative.substring(1);
            Page p;
            try {
                p = super.getPage(getContextPath() + relative);
File
HudsonTestCase.java
Developer's decision
Version 1
Kind of conflict
While statement
Chunk
Conflicting content 
                }
                throw x;
            }
<<<<<<< HEAD
            if (expectedContentType != null) {
                assertThat(p.getWebResponse().getContentType(), is(expectedContentType));
            }
=======
            assertThat(p.getWebResponse().getContentType(), is(expectedContentType));
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
            return p;
        }
Solution content 
                }
                throw x;
            }
            if (expectedContentType != null) {
                assertThat(p.getWebResponse().getContentType(), is(expectedContentType));
            }
            return p;
        }
File
JenkinsRule.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
        assertNotNull(us.getPlugin("AdaptivePlugin"));
    }
    
<<<<<<< HEAD
=======
    @Test public void updateDirectlyWithHtml() throws Exception {
        UpdateSite us = new UpdateSite("default", new URL(baseUrl, "update-center.json.html").toExternalForm());
        assertNull(us.getPlugin("AdaptivePlugin"));
        assertEquals(FormValidation.ok(), us.updateDirectly(false).get());
        assertNotNull(us.getPlugin("AdaptivePlugin"));
    }
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
}
Solution content 
        assertNotNull(us.getPlugin("AdaptivePlugin"));
    }
    
}
File
UpdateSiteTest.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
        // file names shouldn't matter
    @Bug(18417)
    @Test
    public void fingerprintCleanup() throws Exception {
<<<<<<< HEAD
=======
        Assume.assumeFalse("for p3.upstreamProjects expected:<[hudson.model.FreeStyleProject@590e5b8[test0]]> but was:<[]>", System.getenv("JOB_URL") != null);
>>>>>>> be195b0e19343bff6d966029d8eea99b2c039c32
        FreeStyleProject p1 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles);
        FreeStyleProject p2 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles2);
Solution content 
    @Bug(18417)
    @Test
    public void fingerprintCleanup() throws Exception {
        // file names shouldn't matter
        FreeStyleProject p1 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles);
        FreeStyleProject p2 = createFreeStyleProjectWithFingerprints(singleContents, singleFiles2);
File
FingerprinterTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation