svn commit: r1295280 - /openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java

[hthomann]

Author: hthomann
Date: Wed Feb 29 21:22:48 2012
New Revision: 1295280

URL: http://svn.apache.org/viewvc?rev=1295280&view=rev
Log:
OPENJPA-2117: Back-port Albert's trunk changes to 1.2.x.

Modified:
    
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java

Modified: 
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java?rev=1295280&r1=1295279&r2=1295280&view=diff
==============================================================================
--- 
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
 (original)
+++ 
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
 Wed Feb 29 21:22:48 2012
@@ -569,6 +569,13 @@ public class XMLPersistenceMappingParser
                         break;
                     }
                     // else no break
+                case JavaTypes.COLLECTION:
+                    if(!fm.getValue().isSerialized()) {
+                        
fm.getElementMapping().getValueInfo().setColumns(_cols);
+                    } else {
+                        fm.getValueInfo().setColumns(_cols);
+                    }
+                    break;
                 case JavaTypes.MAP:
                     fm.getElementMapping().getValueInfo().setColumns(_cols);
                     break;