svn commit: r496494 - /incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java

[mszefler]

Author: mszefler
Date: Mon Jan 15 13:13:44 2007
New Revision: 496494

URL: http://svn.apache.org/viewvc?view=rev&rev=496494
Log:
Fixed merge snafu.

Modified:
    
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java

Modified: 
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java?view=diff&rev=496494&r1=496493&r2=496494
==============================================================================
--- 
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
 (original)
+++ 
incubator/ode/trunk/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionImpl.java
 Mon Jan 15 13:13:44 2007
@@ -55,9 +55,8 @@
     
@OneToMany(fetch=FetchType.LAZY,mappedBy="_connection",cascade={CascadeType.ALL})
     private Collection<ScopeDAOImpl> _scopes = new ArrayList<ScopeDAOImpl>();
 
-    public BPELDAOConnectionImpl() {}
-    public BPELDAOConnectionImpl(Long id, EntityManager em) {
-        _id = id;
+    public BPELDAOConnectionImpl(EntityManager em) {
+        _id = 0L;
         _em = em;
     }