openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fa...@apache.org
Subject svn commit: r955474 - /openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
Date Thu, 17 Jun 2010 04:06:56 GMT
Author: fancy
Date: Thu Jun 17 04:06:56 2010
New Revision: 955474

URL: http://svn.apache.org/viewvc?rev=955474&view=rev
Log:
OPENJPA-1697: A EnumValueHandler strategy along with XmlType annotation incorrectly mapped
to XmlType in create table DDL
backout changes - regression in xmlcolumn mappings

Modified:
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=955474&r1=955473&r2=955474&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
Thu Jun 17 04:06:56 2010
@@ -1537,13 +1537,11 @@ public class AnnotationPersistenceMappin
         // cache the JAXB XmlType class if it is present so we do not
         // have a hard-wired dependency on JAXB here
         Class xmlTypeClass = null;
-        if (fm.getValueInfo().getStrategy() != null &&
-            fm.getValueInfo().getStrategy().equals("org.apache.openjpa.jdbc.meta.strats.XMLValueHandler"))
{
-            try {
-                xmlTypeClass = Class.forName("javax.xml.bind.annotation.XmlType");
-            } catch (Exception e) {
-            }
+        try {
+            xmlTypeClass = Class.forName("javax.xml.bind.annotation.XmlType");
+        } catch (Exception e) {
         }
+
         int unique = 0;
         DBIdentifier sSecondary = DBIdentifier.NULL;
         for (int i = 0; i < pcols.length; i++) {



Mime
View raw message