You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2011/12/17 11:02:34 UTC
svn commit: r1215446 -
/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
Author: kevin
Date: Sat Dec 17 10:02:33 2011
New Revision: 1215446
URL: http://svn.apache.org/viewvc?rev=1215446&view=rev
Log:
ISIS-153: query specification does not have to have an ObjectSpecification. This catches those that don't.
Modified:
incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java?rev=1215446&r1=1215445&r2=1215446&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/sql/sql-impl/src/main/java/org/apache/isis/runtimes/dflt/objectstores/sql/auto/AutoMapper.java Sat Dec 17 10:02:33 2011
@@ -35,6 +35,7 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.adapter.version.SerialNumberVersion;
import org.apache.isis.core.metamodel.facets.notpersisted.NotPersistedFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.ObjectSpecificationException;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.objectstores.sql.CollectionMapper;
import org.apache.isis.runtimes.dflt.objectstores.sql.DatabaseConnector;
@@ -193,10 +194,14 @@ public class AutoMapper extends Abstract
final ObjectAdapter field = patternAssoc.get(pattern);
if (field != null) {
String id = patternAssoc.getId();
- ObjectAssociation oa = spec.getAssociation(id);
- NotPersistedFacet fc = oa.getFacet(NotPersistedFacet.class);
- if (fc != null) {
- continue;
+ try {
+ ObjectAssociation oa = spec.getAssociation(id);
+ NotPersistedFacet fc = oa.getFacet(NotPersistedFacet.class);
+ if (fc != null) {
+ continue;
+ }
+ } catch (ObjectSpecificationException e) {
+ // this is ok
}
if (foundFields == 0) {