summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Bull2012-10-01 17:43:29 (EDT)
committerIan Bull2012-10-01 17:44:28 (EDT)
commit6dae919c7be7aae193acb194a82bfe8c7d586446 (patch)
tree000f062f6d7db122a48f7c4e0d2b2fb16d3efc18
parentec7d2f597acf5f0048fb6d6b204a951786e42630 (diff)
downloadrt.equinox.p2-6dae919c7be7aae193acb194a82bfe8c7d586446.zip
rt.equinox.p2-6dae919c7be7aae193acb194a82bfe8c7d586446.tar.gz
rt.equinox.p2-6dae919c7be7aae193acb194a82bfe8c7d586446.tar.bz2
Bug 387557: Short circuit in the jar processor if we don't do anyv20121001-214428I20121009-0800I20121002-0800
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.
-rw-r--r--bundles/org.eclipse.equinox.p2.jarprocessor/src/org/eclipse/internal/provisional/equinox/p2/jarprocessor/JarProcessor.java4
1 files changed, 4 insertions, 0 deletions
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 @@ public class JarProcessor {
//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)) {