You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ri...@apache.org on 2008/07/21 13:45:10 UTC

svn commit: r678397 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java

Author: rickmcguire
Date: Mon Jul 21 04:45:10 2008
New Revision: 678397

URL: http://svn.apache.org/viewvc?rev=678397&view=rev
Log:
Fix cut-an-paste error in previous commit

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java?rev=678397&r1=678396&r2=678397&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/CmpJpaConversion.java Mon Jul 21 04:45:10 2008
@@ -804,7 +804,7 @@
         }
         
         String idClassName = idclass.getClazz(); 
-        String currentClassName = idclass.getClazz(); 
+        String currentClassName = current.getClazz(); 
         
         // defined at the same level (common).  Just keep the same id class 
         if (idClassName.equals(currentClassName)) {
@@ -813,7 +813,7 @@
         
         // we have a split across the hiearchy, we need to figure out which of the classes is 
         // the most derived 
-        for (Class clazz = ejbClass; clazz != null; clazz = clazz.getSuperclass()){
+        for (Class clazz = ejbClass; clazz != null; clazz = clazz.getSuperclass()) {
             String name = clazz.getName(); 
             // if we find the current one first, return it 
             if (name.equals(currentClassName)) {