| commit | 965de34ce8bc0cdcbdc6ad87957f3feaf40f8ed2 | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Tue Apr 09 12:11:33 2013 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Tue Apr 09 12:11:33 2013 +0000 |
| tree | 0568f9244c75332b1c70b99346d2f62295b7a64a | |
| parent | 39a3cbdff7b417f26479b18c4abcbca04f8b6b60 [diff] |
FELIX-3977 : @Property: ArrayIndexOutOfBoundsException empty array default value git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1465983 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/annotations/changelog.txt b/scrplugin/annotations/changelog.txt index b9e0179..b1df35c 100644 --- a/scrplugin/annotations/changelog.txt +++ b/scrplugin/annotations/changelog.txt
@@ -1,3 +1,9 @@ + Changes from 1.9.2 to 1.9.0 +---------------------------- +** Bug + * [FELIX-3977] - @Property: ArrayIndexOutOfBoundsException empty array default value + + Changes from 1.9.0 to 1.8.0 ---------------------------- ** Bug
diff --git a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java index e3a1c88..e318311 100644 --- a/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java +++ b/scrplugin/annotations/src/main/java/org/apache/felix/scrplugin/processing/SCRAnnotationProcessor.java
@@ -396,7 +396,7 @@ newValues[i] = Array.get(value, i).toString(); } prop.setMultiValue(newValues); - prop.setType(PropertyType.from(Array.get(value, 0).getClass())); + prop.setType(PropertyType.from(fieldAnnotation.getAnnotatedField().getType().getComponentType())); } else { prop.setType(PropertyType.from(value.getClass())); prop.setValue(value.toString());