| commit | 9ad14aebcaa1d0cabd6cb0b45d27812213e01f71 | [log] [tgz] |
|---|---|---|
| author | dleberre <leberre@cril.univ-artois.fr> | Mon Nov 21 15:53:13 2011 +0100 |
| committer | dleberre <leberre@cril.univ-artois.fr> | Mon Nov 21 15:53:13 2011 +0100 |
| tree | 40205ce89f8a6d1e76d66093c076da0dd41ca5a4 | |
| parent | fc3c7f987d87d091f29421e523d6e01c424d6e1e [diff] | |
| parent | a94d73961d019993863eb7a5a5e81bd64742b74a [diff] |
Merge branch 'master' of http://git.eclipse.org/gitroot/equinox/rt.equinox.incubator
diff --git a/p2/demos/misc-conf-2010/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java b/p2/demos/misc-conf-2010/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java index c87facc..5bcda20 100644 --- a/p2/demos/misc-conf-2010/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java +++ b/p2/demos/misc-conf-2010/org.eclipse.equinox.p2.cudf/src/main/java/org/eclipse/equinox/p2/cudf/solver/Projector.java
@@ -502,7 +502,8 @@ } public void stopSolver() { - dependencyHelper.stopSolver(); + if (dependencyHelper != null) + dependencyHelper.stopSolver(); } public Collection getBestSolutionFoundSoFar() {