openjpa-commits mailing list archives

Author: pcl
Date: Thu Apr 10 19:37:43 2008
New Revision: 647033

URL: http://svn.apache.org/viewvc?rev=647033&view=rev
Log:
OPENJPA-536 -- temporarily disabling earlier fix to this issue as it is causing integration
problems. A more complete fix will be forthcoming.

Modified:
    openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
    openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java

Modified: openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?rev=647033&r1=647032&r2=647033&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
(original)
+++ openjpa/branches/1.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
Thu Apr 10 19:37:43 2008
@@ -574,7 +574,12 @@
      * if we're still in the process of resolving other metadatas.
      */
     private List resolveMeta(ClassMetaData meta) {
-    	setBaseIfNecessary(meta);
+
+        // pcl: 10 April 2008: disabling temporarily as this is causing
+        // integration problems. A more complete fix will be forthcoming.
+        // See OPENJPA-536. Also disabled code in TestGetMetaData.
+        // setBaseIfNecessary(meta);
+
         if (meta.getPCSuperclass() == null) {
             // set superclass
             Class sup = meta.getDescribedType().getSuperclass();

Modified: openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java?rev=647033&r1=647032&r2=647033&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
(original)
+++ openjpa/branches/1.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestGetMetaData.java
Thu Apr 10 19:37:43 2008
@@ -29,7 +29,10 @@
     }
 
     public void testGetMetaData() {
-        assertNotNull(JPAFacadeHelper.getMetaData(emf, Item.class));
-        assertNotNull(JPAFacadeHelper.getMetaData(emf, Person.class));
+        // pcl: 10 April 2008: disabling temporarily as this is causing
+        // integration problems. A more complete fix will be forthcoming.
+        // See OPENJPA-536. Also disabled code in MetaDataRepository.
+        // assertNotNull(JPAFacadeHelper.getMetaData(emf, Item.class));
+        // assertNotNull(JPAFacadeHelper.getMetaData(emf, Person.class));
     }
 }