You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ma...@apache.org on 2011/06/22 09:41:50 UTC
svn commit: r1138326 -
/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java
Author: marrs
Date: Wed Jun 22 07:41:50 2011
New Revision: 1138326
URL: http://svn.apache.org/viewvc?rev=1138326&view=rev
Log:
Small bugfix, under certain circumstances, the filter key was not properly constructed.
Modified:
felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java
Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java?rev=1138326&r1=1138325&r2=1138326&view=diff
==============================================================================
--- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java (original)
+++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/index/MultiPropertyExactFilter.java Wed Jun 22 07:41:50 2011
@@ -206,11 +206,6 @@ public class MultiPropertyExactFilter im
return true;
}
- public static void main(String[] args) {
-
- System.out.println("" + (new MultiPropertyExactFilter(new String[] { "objectClass", "repository", "path", "name" })).isApplicable(null, "(objectClass=abc)"));
- }
-
public boolean isApplicable(String clazz, String filter) {
// "(&(a=b)(c=d))"
// "(&(&(a=b)(c=d))(objC=aaa))"
@@ -240,7 +235,7 @@ public class MultiPropertyExactFilter im
}
// TODO check value tuple[1]
}
- return (found.size() == m_propertyKeys.size());
+ return found.size() == m_propertyKeys.size();
}
else if (filter != null && filter.startsWith("(&(") && filter.endsWith("))")) {
String[] parts = filter.substring(3, filter.length() - 2).split("\\)\\(");
@@ -255,7 +250,7 @@ public class MultiPropertyExactFilter im
}
// TODO check value tuple[1]
}
- return (found.size() == m_propertyKeys.size());
+ return found.size() == m_propertyKeys.size();
}
else if (filter != null && filter.startsWith("(") && filter.endsWith(")") && m_propertyKeys.size() == 1) { // TODO quick hack
String part = filter.substring(1, filter.length() - 1);
@@ -331,7 +326,7 @@ public class MultiPropertyExactFilter im
} // (&(obC=a)(&(a=b)(c=d)))
if (filter != null) {
String startString = "(" + key + "=";
- int i1 = filter.indexOf(startString);
+ int i1 = filter.toLowerCase().indexOf(startString);
if (i1 != -1) {
int i2 = filter.indexOf(")(", i1);
if (i2 == -1) {