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/12/16 13:14:16 UTC
svn commit: r1215105 -
/felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java
Author: marrs
Date: Fri Dec 16 12:14:16 2011
New Revision: 1215105
URL: http://svn.apache.org/viewvc?rev=1215105&view=rev
Log:
FELIX-3245 applied the patch
Modified:
felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java
Modified: felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java?rev=1215105&r1=1215104&r2=1215105&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java (original)
+++ felix/trunk/deploymentadmin/autoconf/src/main/java/org/apache/felix/deployment/rp/autoconf/AutoConfResourceProcessor.java Fri Dec 16 12:14:16 2011
@@ -516,7 +516,7 @@ public class AutoConfResourceProcessor i
result = typedContent;
}
else if (cardinality < 0) {
- if (typedContent.length == cardinality) {
+ if (typedContent.length <= Math.abs(cardinality)) {
result = new Vector(Arrays.asList(typedContent));
}
else {
@@ -524,7 +524,7 @@ public class AutoConfResourceProcessor i
}
}
else if (cardinality > 0) {
- if (typedContent.length == cardinality) {
+ if (typedContent.length <= cardinality) {
result = typedContent;
}
else {