Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-07-02 19:48:09 +0000
committerThomas Watson2014-07-02 19:48:09 +0000
commit84a00d87aa779a3d4dedca8d4ca429efecac5df9 (patch)
treef1c0547380dd7423a40e3941c0bf99e6c89591f0 /bundles
parent855ffcdb61166bd8a5f81e2ac004cfc93ccc583e (diff)
downloadrt.equinox.framework-84a00d87aa779a3d4dedca8d4ca429efecac5df9.tar.gz
rt.equinox.framework-84a00d87aa779a3d4dedca8d4ca429efecac5df9.tar.xz
rt.equinox.framework-84a00d87aa779a3d4dedca8d4ca429efecac5df9.zip
Bug 438652 - NPE when exporting a bundle with 'Deployable Plug-ins andI20140708-0800
Fragments' - Fixed by using empty collection when platform properties do not contain values for osname or processor Change-Id: Ia699723db6a054cfbfd39068a84d84e83ba72024 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java6
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);

Back to the top