You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by jo...@apache.org on 2013/06/04 23:24:14 UTC

svn commit: r1489617 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java

Author: johnthuss
Date: Tue Jun  4 21:24:00 2013
New Revision: 1489617

URL: http://svn.apache.org/r1489617
Log:
Relax type bounds on objectFromDataRow to allow for Persistent subclasses too

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java?rev=1489617&r1=1489616&r2=1489617&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataContext.java Tue Jun  4 21:24:00 2013
@@ -414,7 +414,7 @@ public class DataContext extends BaseCon
      * @see DataRow
      * @since 3.1
      */
-    public <T extends DataObject> T objectFromDataRow(Class<T> objectClass, DataRow dataRow) {
+    public <T extends Persistent> T objectFromDataRow(Class<T> objectClass, DataRow dataRow) {
         ObjEntity entity = this.getEntityResolver().lookupObjEntity(objectClass);
 
         if (entity == null) {