You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2017/10/06 20:57:46 UTC
svn commit: r1811371 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
Author: pauls
Date: Fri Oct 6 20:57:46 2017
New Revision: 1811371
URL: http://svn.apache.org/viewvc?rev=1811371&view=rev
Log:
FELIX-5707: don't require osname and processor parameters for native libs.
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java?rev=1811371&r1=1811370&r2=1811371&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/NativeLibraryClause.java Fri Oct 6 20:57:46 2017
@@ -239,13 +239,17 @@ public class NativeLibraryClause
String language = (String) configMap.get(FelixConstants.FRAMEWORK_LANGUAGE);
// Check library's osname.
- if (!checkOSNames(osName, getOSNames()))
+ if ((getOSNames() != null) &&
+ (getOSNames().length > 0) &&
+ !checkOSNames(osName, getOSNames()))
{
return false;
}
// Check library's processor.
- if (!checkProcessors(processorName, getProcessors()))
+ if ((getProcessors() != null) &&
+ (getProcessors().length > 0) &&
+ !checkProcessors(processorName, getProcessors()))
{
return false;
}
@@ -268,7 +272,6 @@ public class NativeLibraryClause
// Check library's selection-filter if specified.
if ((getSelectionFilter() != null) &&
- (getSelectionFilter().length() >= 0) &&
!checkSelectionFilter(configMap, getSelectionFilter()))
{
return false;