You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ss...@apache.org on 2008/11/01 01:23:49 UTC

svn commit: r709615 - /openjpa/branches/0.9.7-r547073/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java

Author: ssegu
Date: Fri Oct 31 17:23:48 2008
New Revision: 709615

URL: http://svn.apache.org/viewvc?rev=709615&view=rev
Log:
OPENJPA-562. (Merge back from trunk)

Modified:
    openjpa/branches/0.9.7-r547073/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java

Modified: openjpa/branches/0.9.7-r547073/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
URL: http://svn.apache.org/viewvc/openjpa/branches/0.9.7-r547073/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java?rev=709615&r1=709614&r2=709615&view=diff
==============================================================================
--- openjpa/branches/0.9.7-r547073/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java (original)
+++ openjpa/branches/0.9.7-r547073/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java Fri Oct 31 17:23:48 2008
@@ -1052,9 +1052,12 @@
                     //set "isUsedInOrderBy" to the field
                     ClassMetaData elemCls = getElement()
                         .getDeclaredTypeMetaData();
-                    FieldMetaData fmd = elemCls.getDeclaredField(decs[i]);
-                    if (fmd != null)
-                        fmd.setUsedInOrderBy(true);
+
+                    if (elemCls != null) {
+                        FieldMetaData fmd = elemCls.getDeclaredField(decs[i]);
+                        if (fmd != null)
+                            fmd.setUsedInOrderBy(true);
+                    }
                 }
                 _orders = orders;
             }