mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-06-04 16:27:33 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
--- 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 {
|