diff options
Diffstat (limited to 'bundles/org.eclipse.osgi.compatibility.state')
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF index 413b2028c..d445c36c9 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.osgi.compatibility.state -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier ExtensionBundle-Activator: org.eclipse.osgi.compatibility.state.Activator Fragment-Host: org.eclipse.osgi;bundle-version="3.10.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java index f15e47ae4..e980689f2 100644 --- a/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java +++ b/bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2013 IBM Corporation and others. + * Copyright (c) 2007, 2014 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -77,7 +77,7 @@ public class NativeCodeSpecificationImpl extends VersionConstraintImpl implement platformOS = aliasMapper.getCanonicalOSName((String) platformOS); platformOSAliases = aliasMapper.getOSNameAliases((String) platformOS); } else { - platformOSAliases = Collections.singleton(platformOS); + platformOSAliases = platformOS == null ? Collections.emptyList() : Collections.singleton(platformOS); } osNamesLoop: for (String osName : osNames) { String canonicalOSName = aliasMapper.getCanonicalOSName(osName); @@ -109,7 +109,7 @@ public class NativeCodeSpecificationImpl extends VersionConstraintImpl implement platformProcessor = aliasMapper.getCanonicalProcessor((String) platformProcessor); platformProcessorAliases = aliasMapper.getProcessorAliases((String) platformProcessor); } else { - platformProcessorAliases = Collections.singletonList(platformProcessor); + platformProcessorAliases = platformProcessor == null ? Collections.emptyList() : Collections.singleton(platformProcessor); } processorLoop: for (String processor : processors) { String canonicalProcessor = aliasMapper.getCanonicalProcessor(processor); |