Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to fix NPE in RunResolution.resolve() #6381

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion biz.aQute.bndlib/src/aQute/bnd/osgi/package-info.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Version("7.2.0")
@Version("7.3.0")
package aQute.bnd.osgi;

import org.osgi.annotation.versioning.Version;
6 changes: 3 additions & 3 deletions biz.aQute.resolve/src/biz/aQute/resolve/RunResolution.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ public static RunResolution resolve(Project project, Processor actualProperties,
*/
public static RunResolution resolve(Project project, Processor actualProperties,
Collection<ResolutionCallback> callbacks, ResolverLogger resolverLogger) {
if (ResolveMode.never.toString()
.equals(project.get(Constants.RESOLVE))) {
if (ResolveMode.never.name()
.equals(actualProperties.get(Constants.RESOLVE))) {
return new RunResolution(project, actualProperties, new UnsupportedOperationException(String
.format("Resolve is forbidden here, as %s is set to %s", Constants.RESOLVE,
ResolveMode.never.toString())),
ResolveMode.never.name())),
null);
}
if (callbacks == null)
Expand Down