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

[hthomann]

Author: hthomann
Date: Thu Mar  1 02:34:54 2012
New Revision: 1295384

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

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

Modified: 
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java?rev=1295384&r1=1295383&r2=1295384&view=diff
==============================================================================
--- 
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
 (original)
+++ 
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
 Thu Mar  1 02:34:54 2012
@@ -678,7 +678,7 @@ public class XMLPersistenceMappingParser
                     }
                     // else no break
                 case JavaTypes.COLLECTION:
-                    if(fm.isElementCollection()) { 
+                    if (!fm.getValue().isSerialized()) { 
                         
fm.getElementMapping().getValueInfo().setColumns(_cols);
                     } else  {
                         fm.getValueInfo().setColumns(_cols);