| commit | 6dae919c7be7aae193acb194a82bfe8c7d586446 | [log] [tgz] |
|---|---|---|
| author | Ian Bull <irbull@eclipsesource.com> | Mon Oct 01 14:43:29 2012 -0700 |
| committer | Ian Bull <irbull@eclipsesource.com> | Mon Oct 01 14:44:28 2012 -0700 |
| tree | 000f062f6d7db122a48f7c4e0d2b2fb16d3efc18 | |
| parent | ec7d2f597acf5f0048fb6d6b204a951786e42630 [diff] |
Bug 387557: Short circuit in the jar processor if we don't do any processing steps. If we don't do any processing steps in the Jar Processor, just skip the jar and leave the one we started with.
diff --git a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java index 5e6ec83..217d010 100644 --- a/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java +++ b/bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java
@@ -339,6 +339,10 @@ //have to normalize after the post steps normalize(result, workingDir); + // If the original input is where we ended up, just return it + if (input.equals(result)) + return result; + if (!result.equals(workingFile) && !workingFile.equals(input)) workingFile.delete(); if (!result.getParentFile().equals(workingDir)) {