Author: pete.muir(a)jboss.org Date: 2008-02-05 18:18:14 -0500 (Tue, 05 Feb 2008) New Revision: 7376 Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java Log: Check whether an SMPC can be accessed. No NPE Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java 2008-02-05 21:38:39 UTC (rev 7375) +++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java 2008-02-05 23:18:14 UTC (rev 7376) @@ -59,6 +59,7 @@ { store.setPersistenceContext(getPersistenceContext().getValue()); } + store.validate(); } @SuppressWarnings("unchecked") Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java 2008-02-05 21:38:39 UTC (rev 7375) +++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java 2008-02-05 23:18:14 UTC (rev 7376) @@ -52,4 +52,6 @@ protected abstract Identifier createIdentifier(Object entity); + public abstract void validate(); + } \ No newline at end of file Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java 2008-02-05 21:38:39 UTC (rev 7375) +++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java 2008-02-05 23:18:14 UTC (rev 7376) @@ -46,8 +46,20 @@ return "entityManager"; } + @Override + public void validate() + { + if (getPersistenceContext() == null) + { + throw new IllegalStateException("Unable to access a persistence context. You must either have a SMPC called entityManager or configure one in components.xml"); + } + + } + public static EntityLoader instance() { return (EntityLoader) Component.getInstance(EntityLoader.class, STATELESS); } + + } Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java =================================================================== --- trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java 2008-02-05 21:38:39 UTC (rev 7375) +++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java 2008-02-05 23:18:14 UTC (rev 7376) @@ -49,4 +49,14 @@ { return (HibernateEntityLoader) Component.getInstance(HibernateEntityLoader.class, STATELESS); } + + @Override + public void validate() + { + if (getPersistenceContext() == null) + { + throw new IllegalStateException("Unable to access a Seam Managed Hibernate Session. You must either have a Seam Managed Hibernate Session called session or configure one in components.xml"); + } + + } }