svn commit: r1460113 - in /cayenne/main/branches/STABLE-3.1/framework: cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java

[aadamchik]

Author: aadamchik
Date: Sat Mar 23 07:48:58 2013
New Revision: 1460113

URL: http://svn.apache.org/r1460113
Log:
CAY-1804  Serialisation of long[] type was not working correctly.

patch by      Kris Erik Schwerdt

(cherry picked from commit 8a836401f83f50f308a770fba50221c5c572b853)

Modified:
    
cayenne/main/branches/STABLE-3.1/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
    
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java

Modified: 
cayenne/main/branches/STABLE-3.1/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java?rev=1460113&r1=1460112&r2=1460113&view=diff
==============================================================================
--- 
cayenne/main/branches/STABLE-3.1/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
 (original)
+++ 
cayenne/main/branches/STABLE-3.1/framework/cayenne-di-unpublished/src/main/java/org/apache/cayenne/di/spi/DefaultAdhocObjectFactory.java
 Sat Mar 23 07:48:58 2013
@@ -159,6 +159,9 @@ public class DefaultAdhocObjectFactory i
             else if ("int".equals(className)) {
                 return int[].class;
             }
+           else if ("long".equals(className)) {
+               return long[].class;
+           }
             else if ("short".equals(className)) {
                 return short[].class;
             }

Modified: 
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java?rev=1460113&r1=1460112&r2=1460113&view=diff
==============================================================================
--- 
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
 (original)
+++ 
cayenne/main/branches/STABLE-3.1/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/reflect/PropertyUtils.java
 Sat Mar 23 07:48:58 2013
@@ -276,6 +276,9 @@ public class PropertyUtils {
             else if ("int".equals(className)) {
                 return Integer.class;
             }
+            else if ("long".equals(className)) {
+                return Long.class;
+            }
             else if ("short".equals(className)) {
                 return Short.class;
             }
@@ -310,6 +313,9 @@ public class PropertyUtils {
             else if ("int".equals(className)) {
                 return Integer.valueOf(0);
             }
+           else if ("long".equals(className)) {
+               return Long.valueOf(0);
+           }
             else if ("short".equals(className)) {
                 return Short.valueOf((short) 0);
             }