Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-02-21 15:46:53 +0000
committerThomas Watson2013-02-21 15:46:53 +0000
commitdbfb9069de39e4b80e55685bb0081230bdf980ad (patch)
treede51d9b6c2c2b62c9a250907811466fe447ed89c /bundles/org.eclipse.osgi.compatibility.state
parenta8d99e014c05d32bd4d0084ad3b323e71c4835ed (diff)
parent0d5c40d55fff4174d33ec45c039837dcafa934a1 (diff)
downloadrt.equinox.framework-dbfb9069de39e4b80e55685bb0081230bdf980ad.tar.gz
rt.equinox.framework-dbfb9069de39e4b80e55685bb0081230bdf980ad.tar.xz
rt.equinox.framework-dbfb9069de39e4b80e55685bb0081230bdf980ad.zip
Merge branch 'master' into twatson/container
Conflicts: bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/security/BaseSecurityTest.java bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/BundleLoader.java bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/loader/buddy/PolicyHandler.java bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/log/EquinoxLogServices.java bundles/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/BundleHost.java
Diffstat (limited to 'bundles/org.eclipse.osgi.compatibility.state')
-rw-r--r--bundles/org.eclipse.osgi.compatibility.state/src/org/eclipse/osgi/internal/resolver/NativeCodeSpecificationImpl.java6
1 files changed, 3 insertions, 3 deletions
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 1bbb00470..00269aec7 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, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 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
@@ -119,7 +119,7 @@ public class NativeCodeSpecificationImpl extends VersionConstraintImpl implement
}
}
if (!match)
- return false;
+ continue;
match = false;
String[] languages = nativeSupplier.getLanguages();
@@ -134,7 +134,7 @@ public class NativeCodeSpecificationImpl extends VersionConstraintImpl implement
}
}
if (!match)
- return false;
+ continue;
match = false;
VersionRange[] osVersions = nativeSupplier.getOSVersions();

Back to the top