You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2006/02/12 02:42:02 UTC
svn commit: r377104 - in /db/ojb/branches/OJB_1_0_RELEASE/src:
java/org/apache/ojb/odmg/collections/ test/org/apache/ojb/odmg/
Author: arminw
Date: Sat Feb 11 17:42:00 2006
New Revision: 377104
URL: http://svn.apache.org/viewcvs?rev=377104&view=rev
Log:
cleanup logging
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListEntry.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListImpl.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/DSetTest.java
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListEntry.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListEntry.java?rev=377104&r1=377103&r2=377104&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListEntry.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListEntry.java Sat Feb 11 17:42:00 2006
@@ -43,7 +43,8 @@
/*
* declare transient, because ManageableCollection entries need to be {@link java.io.Serializable}.
*/
- private transient Logger log;
+ private Logger log = LoggerFactory.getLogger(DListEntry.class);
+
protected transient Object realSubject;
protected PBKey pbKey;
@@ -83,15 +84,6 @@
this.pbKey = getPBKey();
}
- protected Logger getLog()
- {
- if(log == null)
- {
- log = LoggerFactory.getLogger(DListEntry.class);
- }
- return log;
- }
-
protected TransactionImpl getTransaction()
{
return TxManagerFactory.instance().getTransaction();
@@ -169,7 +161,7 @@
}
else
{
- getLog().warn("No tx, no PBKey - can't materialise object with Identity " + getOid());
+ log.warn("No tx, no PBKey - can't materialise object with Identity " + getOid());
}
}
}
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListImpl.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListImpl.java?rev=377104&r1=377103&r2=377104&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListImpl.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DListImpl.java Sat Feb 11 17:42:00 2006
@@ -37,9 +37,9 @@
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
import org.apache.ojb.odmg.PBCapsule;
+import org.apache.ojb.odmg.RuntimeObject;
import org.apache.ojb.odmg.TransactionImpl;
import org.apache.ojb.odmg.TxManagerFactory;
-import org.apache.ojb.odmg.RuntimeObject;
import org.apache.ojb.odmg.oql.OQLQueryImpl;
import org.odmg.DArray;
import org.odmg.DCollection;
@@ -61,7 +61,7 @@
{
private static final long serialVersionUID = -9219943066614026526L;
- private transient Logger log;
+ private Logger log = LoggerFactory.getLogger(DListImpl.class);
private Integer id;
private List elements;
@@ -93,15 +93,6 @@
this.pbKey = pbKey;
}
- protected Logger getLog()
- {
- if (log == null)
- {
- log = LoggerFactory.getLogger(DListImpl.class);
- }
- return log;
- }
-
private DListEntry prepareEntry(Object obj)
{
return new DListEntry(this, obj);
@@ -426,11 +417,11 @@
}
catch (PersistenceBrokerException e)
{
- getLog().error(e);
+ log.error(e);
throw new ODMGRuntimeException(e.getMessage());
}
Query q = new QueryByCriteria(clazz, allElementsCriteria);
- if (getLog().isDebugEnabled()) getLog().debug(q.toString());
+ if (log.isDebugEnabled()) log.debug(q.toString());
result = null;
try
@@ -439,7 +430,7 @@
}
catch (PersistenceBrokerException e)
{
- getLog().error("Query failed", e);
+ log.error("Query failed", e);
throw new OJBRuntimeException(e);
}
}
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapEntry.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapEntry.java?rev=377104&r1=377103&r2=377104&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapEntry.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapEntry.java Sat Feb 11 17:42:00 2006
@@ -39,7 +39,7 @@
public class DMapEntry implements Entry, Serializable, PersistenceBrokerAware
{
private static final long serialVersionUID = 4382757889982004339L;
- private transient Logger log = LoggerFactory.getLogger(DMapEntry.class);
+ private Logger log = LoggerFactory.getLogger(DMapEntry.class);
private PBKey pbKey;
@@ -79,15 +79,6 @@
getPBKey();
}
- protected Logger getLog()
- {
- if(log == null)
- {
- log = LoggerFactory.getLogger(DMapEntry.class);
- }
- return log;
- }
-
protected TransactionImpl getTransaction()
{
return TxManagerFactory.instance().getTransaction();
@@ -136,7 +127,7 @@
{
if(keyOid == null)
{
- getLog().info("Cannot retrieve real key object because its id is not known");
+ log.info("Cannot retrieve real key object because its id is not known");
}
else
{
@@ -148,7 +139,7 @@
{
if(valueOid == null)
{
- getLog().info("Cannot retrieve real key object because its id is not known");
+ log.info("Cannot retrieve real key object because its id is not known");
}
else
{
@@ -190,7 +181,7 @@
}
else
{
- getLog().warn("No tx, no PBKey - can't materialise key with Identity " + getKeyOid());
+ log.warn("No tx, no PBKey - can't materialise key with Identity " + getKeyOid());
}
}
}
@@ -248,7 +239,7 @@
}
else
{
- getLog().warn("No tx, no PBKey - can't materialise value with Identity " + getKeyOid());
+ log.warn("No tx, no PBKey - can't materialise value with Identity " + getKeyOid());
}
}
}
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapImpl.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapImpl.java?rev=377104&r1=377103&r2=377104&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapImpl.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DMapImpl.java Sat Feb 11 17:42:00 2006
@@ -25,8 +25,6 @@
import org.apache.ojb.broker.PersistenceBrokerAware;
import org.apache.ojb.broker.PersistenceBrokerException;
import org.apache.ojb.broker.util.collections.ManageableHashSet;
-import org.apache.ojb.broker.util.logging.Logger;
-import org.apache.ojb.broker.util.logging.LoggerFactory;
import org.apache.ojb.odmg.RuntimeObject;
import org.apache.ojb.odmg.TransactionExt;
import org.apache.ojb.odmg.TransactionImpl;
@@ -42,7 +40,7 @@
public class DMapImpl extends AbstractMap implements DMap, Serializable, PersistenceBrokerAware
{
private static final long serialVersionUID = 7048246616243056480L;
- private transient Logger log;
+ //private Logger log = LoggerFactory.getLogger(DMapImpl.class);
private Integer id;
private Set entries;
@@ -64,15 +62,6 @@
{
this.entries = new ManageableHashSet();
this.pbKey = key;
- }
-
- protected Logger getLog()
- {
- if (log == null)
- {
- log = LoggerFactory.getLogger(DMapImpl.class);
- }
- return log;
}
protected TransactionImpl getTransaction()
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DSetImpl.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DSetImpl.java?rev=377104&r1=377103&r2=377104&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DSetImpl.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/odmg/collections/DSetImpl.java Sat Feb 11 17:42:00 2006
@@ -18,16 +18,16 @@
import java.io.Serializable;
import java.util.AbstractSet;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import java.util.Collection;
+import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.PBKey;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerAware;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.ManageableCollection;
import org.apache.ojb.broker.core.ValueContainer;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
@@ -37,9 +37,9 @@
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
import org.apache.ojb.odmg.PBCapsule;
+import org.apache.ojb.odmg.RuntimeObject;
import org.apache.ojb.odmg.TransactionImpl;
import org.apache.ojb.odmg.TxManagerFactory;
-import org.apache.ojb.odmg.RuntimeObject;
import org.apache.ojb.odmg.oql.OQLQueryImpl;
import org.odmg.DCollection;
import org.odmg.DList;
@@ -56,7 +56,7 @@
{
private static final long serialVersionUID = -4459673364598652639L;
- private transient Logger log;
+ private Logger log = LoggerFactory.getLogger(DSetImpl.class);
private Integer id;
private List elements;
@@ -86,15 +86,6 @@
{
this();
this.pbKey = pbKey;
- }
-
- protected Logger getLog()
- {
- if (log == null)
- {
- log = LoggerFactory.getLogger(DSetImpl.class);
- }
- return log;
}
private DSetEntry prepareEntry(Object obj)
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/DSetTest.java
URL: http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/DSetTest.java?rev=377104&r1=377103&r2=377104&view=diff
==============================================================================
--- db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/DSetTest.java (original)
+++ db/ojb/branches/OJB_1_0_RELEASE/src/test/org/apache/ojb/odmg/DSetTest.java Sat Feb 11 17:42:00 2006
@@ -104,7 +104,7 @@
lookedUp = (DSet) database.lookup(name);
iter = lookedUp.iterator();
iter1 = list.iterator();
- assertEquals("Wrong number of DListEntry found", 8, list.size());
+ assertEquals("Wrong number of DListEntry found", list.size(), lookedUp.size());
while (iter.hasNext())
{
DListTest.DObject a = (DListTest.DObject) iter.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org