You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/12/24 20:10:10 UTC
svn commit: r606726 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/FieldAccessor.java
Author: aadamchik
Date: Mon Dec 24 11:10:08 2007
New Revision: 606726
URL: http://svn.apache.org/viewvc?rev=606726&view=rev
Log:
fixing field type check
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/FieldAccessor.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/FieldAccessor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/FieldAccessor.java?rev=606726&r1=606725&r2=606726&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/FieldAccessor.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/FieldAccessor.java Mon Dec 24 11:10:08 2007
@@ -93,7 +93,10 @@
* Finds a field for the property, ensuring that direct access via reflection is
* possible.
*/
- protected Field prepareField(Class<?> beanClass, String propertyName, Class<?> propertyType) {
+ protected Field prepareField(
+ Class<?> beanClass,
+ String propertyName,
+ Class<?> propertyType) {
Field field;
// locate field
@@ -121,11 +124,11 @@
if (propertyType != null) {
// check that the field is of expected class...
- if (!propertyType.isAssignableFrom(field.getType())) {
+ if (!field.getType().isAssignableFrom(propertyType)) {
// allow primitive to object conversions...
- if (!PropertyUtils.normalizeType(propertyType).isAssignableFrom(
- PropertyUtils.normalizeType(field.getType()))) {
+ if (!PropertyUtils.normalizeType(field.getType()).isAssignableFrom(
+ PropertyUtils.normalizeType(propertyType))) {
throw new CayenneRuntimeException("Expected property type '"
+ propertyType.getName()
+ "', got '"