Changeset 3069

Timestamp:

01/19/12 13:28:58 (4 months ago)

Author:

kasper

Message:

Fixed minor bug pertaining to primitive arrays not being recognized as Object instances.

Location:

AnalyzerBeans/trunk/core/src

Files:

• main/java/org/eobjects/analyzer/util/ReflectionUtils.java (modified) (3 diffs)
• test/java/org/eobjects/analyzer/util/ReflectionUtilsTest.java (modified) (1 diff)

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/util/ReflectionUtils.java

@@ -79 +79 @@
                         thisClass = (Class<?>) thisType;
                         if (includeArray && thisClass.isArray() && !ofThatType.isArray()) {
+                                if (ofThatType == Object.class) {
+                                        return true;
+                                }
+                                
                                 thisClass = thisClass.getComponentType();
                         }
                 }
+
                 if (thisClass == ofThatType) {
                         return true;
@@ -479 +484 @@
                 }
         }
-        
+
         public static <A extends Annotation> A getAnnotation(Enum<?> enumConstant, Class<A> annotationClass) {
                 try {
@@ -494 +499 @@
                 }
         }
-        
+
         public static boolean isAnnotationPresent(Enum<?> enumConstant, Class<? extends Annotation> annotationClass) {
                 try {

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/util/ReflectionUtilsTest.java

@@ -131 +131 @@
         }
 
+        public void testIsArrayAnObject() throws Exception {
+                assertTrue(ReflectionUtils.is(byte[].class, Object.class));
+        }
+        
+        public void testIsPrimitiveByteAnObject() throws Exception {
+                assertFalse(ReflectionUtils.is(byte.class, Object.class));
+        }
+        
+        public void testIsByteWrapperAnObject() throws Exception {
+                assertTrue(ReflectionUtils.is(Byte.class, Object.class));
+        }
+
 }