From a8ed99d23d7aa232d68140c4ac3bc298f9ada02c Mon Sep 17 00:00:00 2001
From: Pascal Rapicault (JBoss)
Date: Thu, 9 May 2013 00:15:21 -0400
Subject: Bug 407613 - [remediation] Reduce resolver timeout

---
 .../src/org/eclipse/equinox/internal/p2/director/Projector.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.3