felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r917505 - /felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
Date Mon, 01 Mar 2010 12:59:23 GMT
Author: gnodet
Date: Mon Mar  1 12:59:23 2010
New Revision: 917505

URL: http://svn.apache.org/viewvc?rev=917505&view=rev
Log:
FELIX-2113: update to latest OBR snapshot

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

Modified: felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java?rev=917505&r1=917504&r2=917505&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
(original)
+++ felix/trunk/karaf/shell/obr/src/main/java/org/apache/felix/karaf/shell/obr/ResolveCommand.java
Mon Mar  1 12:59:23 2010
@@ -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)) {



Mime
View raw message