diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch |
reinit the tree, so we can have metadata
Diffstat (limited to 'dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch')
-rw-r--r-- | dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch new file mode 100644 index 000000000000..a973ca56a862 --- /dev/null +++ b/dev-java/felix-utils/files/felix-utils-1.2.0-java-fixes.patch @@ -0,0 +1,47 @@ +--- a/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2012-06-12 08:56:50.000000000 +0200 ++++ b/src/main/java/org/apache/felix/utils/filter/FilterImpl.java 2013-05-13 14:25:58.601527069 +0200 +@@ -25,6 +25,7 @@ + import java.security.AccessController; + import java.security.PrivilegedAction; + import java.util.*; ++import java.util.Map.Entry; + + import org.apache.felix.utils.version.VersionTable; + import org.osgi.framework.Filter; +@@ -111,6 +111,19 @@ + converted = conv; + } + ++ @Override ++ public boolean matches(Map<String, ?> map) ++ { ++ Map nonGenericMap = new HashMap(); ++ ++ for(Entry<String, ?> entry : map.entrySet()) ++ { ++ nonGenericMap.put(entry.getKey(), entry.getValue()); ++ } ++ ++ return match0(nonGenericMap); ++ } ++ + + /** + * Filter using a service's properties. +@@ -575,13 +587,13 @@ + switch (operation) { + case APPROX : + case EQUAL : { +- return ((Version) value1).compareTo(converted) == 0; ++ return ((Version) value1).compareTo((Version) converted) == 0; + } + case GREATER: { +- return ((Version) value1).compareTo(converted) >= 0; ++ return ((Version) value1).compareTo((Version) converted) >= 0; + } + case LESS: { +- return ((Version) value1).compareTo(converted) <= 0; ++ return ((Version) value1).compareTo((Version) converted) <= 0; + } + } + } else { |