User: dsundstrom
Date: 02/03/03 13:37:47
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc
JDBCStoreManager.java JDBCLoadEntityCommand.java
JDBCCreateEntityCommand.java
Log:
Moved entityBridge.setCreated into JDBCStoreManager for better handling.
Revision Changes Path
1.29 +10 -2
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStoreManager.java
Index: JDBCStoreManager.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCStoreManager.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JDBCStoreManager.java 27 Feb 2002 00:07:58 -0000 1.28
+++ JDBCStoreManager.java 3 Mar 2002 21:37:46 -0000 1.29
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dain Sundstrom</a>
* @see org.jboss.ejb.EntityPersistenceStore
- * @version $Revision: 1.28 $
+ * @version $Revision: 1.29 $
*/
public class JDBCStoreManager implements EntityPersistenceStore {
@@ -373,7 +373,12 @@
Object[] args,
EntityEnterpriseContext ctx) throws CreateException {
- return createEntityCommand.execute(createMethod, args, ctx);
+ Object pk = createEntityCommand.execute(createMethod, args, ctx);
+
+ // mark the entity as created
+ entityBridge.setCreated(ctx);
+
+ return pk;
}
public Object findEntity(
@@ -403,6 +408,9 @@
}
entityBridge.resetPersistenceContext(ctx);
}
+
+ // mark the entity as created; if it was loading it was created
+ entityBridge.setCreated(ctx);
loadEntityCommand.execute(ctx);
}
1.18 +1 -4
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadEntityCommand.java
Index: JDBCLoadEntityCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCLoadEntityCommand.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JDBCLoadEntityCommand.java 27 Feb 2002 00:07:58 -0000 1.17
+++ JDBCLoadEntityCommand.java 3 Mar 2002 21:37:46 -0000 1.18
@@ -40,7 +40,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Dirk Zimmermann</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>danch (Dan Christopherson)</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class JDBCLoadEntityCommand {
private final JDBCStoreManager manager;
@@ -163,9 +163,6 @@
throw new NoSuchEntityException("Entity not found: primaryKey=" +
ctx.getId());
}
-
- // mark the entity as created; if it was loaded it was created
- entity.setCreated(ctx);
} catch(EJBException e) {
throw e;
} catch(Exception e) {
1.13 +1 -3
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCCreateEntityCommand.java
Index: JDBCCreateEntityCommand.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/JDBCCreateEntityCommand.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JDBCCreateEntityCommand.java 15 Jan 2002 22:14:04 -0000 1.12
+++ JDBCCreateEntityCommand.java 3 Mar 2002 21:37:46 -0000 1.13
@@ -33,7 +33,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Joe Shevland</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Justin Forder</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class JDBCCreateEntityCommand {
private JDBCStoreManager manager;
@@ -130,8 +130,6 @@
}
insertEntity(ctx);
- entity.setCreated(ctx);
-
return pk;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
