commit 785f33af4f84e13b2fe2c6638d970b204876c29a
author Guillaume Nodet <gnodet@apache.org> Mon Mar 01 12:59:23 2010 +0000
committer Guillaume Nodet <gnodet@apache.org> Mon Mar 01 12:59:23 2010 +0000
tree a0dd2d13a7b7d5b9790355d41fbccb036bc60dab
parent d74358bc7fb37d97126931bfc88a2a52ac0783d0

FELIX-2113: update to latest OBR snapshot

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@917505 13f79535-47bb-0310-9956-ffa450edef68

karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java

diff --git a/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java b/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
index 8b73a90..afe44a2 100644
--- a/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
+++ b/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
@@ -66,7 +66,7 @@
         for (Requirement requirement : parseRequirements(admin, requirements)) {
             resolver.add(requirement);
         }
-        if (resolver.resolve(optional ? 0 : Resolver.NO_OPTIONAL_REQUIREMENTS)) {
+        if (resolver.resolve(optional ? 0 : Resolver.NO_OPTIONAL_RESOURCES)) {
             Resource[] resources;
             resources = resolver.getRequiredResources();
             if ((resources != null) && (resources.length > 0)) {