diff options
| author | Pascal Rapicault (JBoss) | 2013-05-09 04:15:21 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2013-05-09 04:15:21 +0000 |
| commit | a8ed99d23d7aa232d68140c4ac3bc298f9ada02c (patch) | |
| tree | c8dd4fe038baf788006c6f2903b1bf37c4108a9c | |
| parent | 3ddae89c32be65ee8099436925cc64c30f7564b4 (diff) | |
| download | rt.equinox.p2-a8ed99d23d7aa232d68140c4ac3bc298f9ada02c.tar.gz rt.equinox.p2-a8ed99d23d7aa232d68140c4ac3bc298f9ada02c.tar.xz rt.equinox.p2-a8ed99d23d7aa232d68140c4ac3bc298f9ada02c.zip | |
Bug 407613 - [remediation] Reduce resolver timeout
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java index d1b15eba1..48c3871a1 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java @@ -208,7 +208,11 @@ public class Projector { System.err.println("Ignoring user-specified 'eclipse.p2.projector.timeout' value of: " + timeoutString); //$NON-NLS-1$ e.printStackTrace(); } - solver.setTimeoutOnConflicts(timeout); + if (userDefinedFunction) + solver.setTimeoutOnConflicts(timeout / 4); + else + solver.setTimeoutOnConflicts(timeout); + IQueryResult<IInstallableUnit> queryResult = picker.query(QueryUtil.createIUAnyQuery(), null); if (DEBUG_ENCODING) { dependencyHelper = new LexicoHelper<Object, Explanation>(solver, false); |