arminw 2005/12/31 10:28:32
Modified: src/java/org/apache/ojb/odmg Tag: OJB_1_0_RELEASE
ImplementationImpl.java ImplementationJTAImpl.java
TransactionImpl.java
Log:
fix OJB-86 and OJB-85
Revision Changes Path
No revision
No revision
1.1.2.13 +17 -19
db-ojb/src/java/org/apache/ojb/odmg/ImplementationImpl.java
Index: ImplementationImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ImplementationImpl.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- ImplementationImpl.java 21 Dec 2005 22:29:21 -0000 1.1.2.12
+++ ImplementationImpl.java 31 Dec 2005 18:28:32 -0000 1.1.2.13
@@ -31,7 +31,6 @@
import org.apache.ojb.broker.util.logging.LoggerFactory;
import org.apache.ojb.odmg.locking.LockManager;
import org.apache.ojb.odmg.locking.LockManagerFactory;
-import org.apache.ojb.odmg.oql.EnhancedOQLQuery;
import org.apache.ojb.odmg.oql.OQLQueryImpl;
import org.odmg.DArray;
import org.odmg.DBag;
@@ -43,6 +42,7 @@
import org.odmg.Implementation;
import org.odmg.ODMGRuntimeException;
import org.odmg.Transaction;
+import org.odmg.OQLQuery;
/**
@@ -58,7 +58,6 @@
{
private Logger log = LoggerFactory.getLogger(ImplementationImpl.class);
-// private List usedDatabases = new ArrayList();
private DatabaseImpl currentDatabase;
private Configurator configurator;
private OJBTxManager ojbTxManager;
@@ -69,7 +68,7 @@
private boolean implicitLocking;
private boolean implicitLockingBackward;
private boolean ordering;
-// private boolean noteUserOrder;
+ private boolean managed = false;
/**
* private Constructor: use static factory method
@@ -85,7 +84,6 @@
impliciteWriteLocks = (conf.getString("LockAssociations",
"WRITE").equalsIgnoreCase("WRITE"));
implicitLocking = conf.getBoolean("ImplicitLocking", true);
ordering = conf.getBoolean("Ordering", true);
-// noteUserOrder = conf.getBoolean("NoteUserOrder", true);
implicitLockingBackward = conf.getBoolean("ImplicitLockingBackward",
false);
if(log.isEnabledFor(Logger.INFO))
{
@@ -194,7 +192,7 @@
* @return The new <code>OQLQuery</code> object.
* @see org.odmg.OQLQuery
*/
- public EnhancedOQLQuery newOQLQuery()
+ public OQLQuery newOQLQuery()
{
if ((getCurrentDatabase() == null) || !getCurrentDatabase().isOpen())
{
@@ -357,8 +355,8 @@
*
* @see ImplementationExt#setImplicitLocking(boolean)
*/
- public void setImplicitLocking(boolean value)
- {
+ public void setImplicitLocking(boolean value)
+ {
if(implicitLockingBackward)
{
((TransactionExt)currentTransaction()).setImplicitLocking(value);
@@ -367,7 +365,7 @@
{
this.implicitLocking = value;
}
- }
+ }
/**
* @see ImplementationExt#isImplicitLocking()
@@ -419,16 +417,6 @@
this.ordering = ordering;
}
-// public boolean isNoteUserOrder()
-// {
-// return noteUserOrder;
-// }
-//
-// public void setNoteUserOrder(boolean noteUserOrder)
-// {
-// this.noteUserOrder = noteUserOrder;
-// }
-
/**
* Allow to use method [EMAIL PROTECTED] #setImplicitLocking(boolean)}
in the same way
* as before version 1.0.4 - if set 'true', recommended setting is
'false'.
@@ -441,6 +429,16 @@
this.implicitLockingBackward = implicitLockingBackward;
}
+ public boolean isManaged()
+ {
+ return managed;
+ }
+
+ public void setManaged(boolean managed)
+ {
+ this.managed = managed;
+ }
+
public String toString()
{
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
1.2.2.4 +4 -3
db-ojb/src/java/org/apache/ojb/odmg/ImplementationJTAImpl.java
Index: ImplementationJTAImpl.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/odmg/ImplementationJTAImpl.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- ImplementationJTAImpl.java 21 Dec 2005 22:29:21 -0000 1.2.2.3
+++ ImplementationJTAImpl.java 31 Dec 2005 18:28:32 -0000 1.2.2.4
@@ -19,7 +19,6 @@
import org.apache.ojb.broker.util.configuration.ConfigurationException;
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
-import org.apache.ojb.odmg.oql.EnhancedOQLQuery;
import org.odmg.DArray;
import org.odmg.DBag;
import org.odmg.DList;
@@ -28,6 +27,7 @@
import org.odmg.Database;
import org.odmg.Implementation;
import org.odmg.Transaction;
+import org.odmg.OQLQuery;
/**
* Implementation of the ODMG [EMAIL PROTECTED] Implementation} interface
for use in
@@ -42,6 +42,7 @@
protected ImplementationJTAImpl()
{
super();
+ setManaged(true);
}
public Database getDatabase(Object obj)
@@ -61,7 +62,7 @@
return new NarrowTransaction((TransactionImpl)
super.currentTransaction());
}
- public EnhancedOQLQuery newOQLQuery()
+ public OQLQuery newOQLQuery()
{
beginInternTransaction();
return super.newOQLQuery();
1.59.2.26 +2 -1 db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java
Index: TransactionImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/odmg/TransactionImpl.java,v
retrieving revision 1.59.2.25
retrieving revision 1.59.2.26
diff -u -r1.59.2.25 -r1.59.2.26
--- TransactionImpl.java 21 Dec 2005 22:29:21 -0000 1.59.2.25
+++ TransactionImpl.java 31 Dec 2005 18:28:32 -0000 1.59.2.26
@@ -393,6 +393,7 @@
if (!getBroker().isInTransaction())
{
if (log.isDebugEnabled()) log.debug("call beginTransaction() on
PB instance");
+ broker.setManaged(implementation.isManaged());
broker.beginTransaction();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
