summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (JBoss)2013-05-09 00:15:21 (EDT)
committerPascal Rapicault2013-05-09 00:15:21 (EDT)
commita8ed99d23d7aa232d68140c4ac3bc298f9ada02c (patch)
treec8dd4fe038baf788006c6f2903b1bf37c4108a9c
parent3ddae89c32be65ee8099436925cc64c30f7564b4 (diff)
downloadrt.equinox.p2-a8ed99d23d7aa232d68140c4ac3bc298f9ada02c.zip
rt.equinox.p2-a8ed99d23d7aa232d68140c4ac3bc298f9ada02c.tar.gz
rt.equinox.p2-a8ed99d23d7aa232d68140c4ac3bc298f9ada02c.tar.bz2
Bug 407613 - [remediation] Reduce resolver timeout
-rw-r--r--bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java6
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 d1b15eb..48c3871 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);