[sorry, forgot attachement, reposting]
Hi All,
Attached patch fixes in several places usage of constructor
QueryByCriteria(Class, Criteria) with null Criteria parameter - replaced with
simplier QueryByCriteria(Class) which achieves the same.
Thanks,
Vadim
Index: src/ejb/org/apache/ojb/ejb/odmg/ODMGBaseBeanImpl.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/odmg/ODMGBaseBeanImpl.java,v
retrieving revision 1.5.2.2
diff -u -r1.5.2.2 ODMGBaseBeanImpl.java
--- src/ejb/org/apache/ojb/ejb/odmg/ODMGBaseBeanImpl.java 11 Sep 2004
12:20:01 -0000 1.5.2.2
+++ src/ejb/org/apache/ojb/ejb/odmg/ODMGBaseBeanImpl.java 29 Dec 2004
15:16:25 -0000
@@ -170,7 +170,7 @@
public int getCount(Class target)
{
PersistenceBroker broker = ((HasBroker)
odmg.currentTransaction()).getBroker();
- int result = broker.getCount(new QueryByCriteria(target, null));
+ int result = broker.getCount(new QueryByCriteria(target));
return result;
}
Index: src/ejb/org/apache/ojb/ejb/odmg/RollbackBean.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/odmg/RollbackBean.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 RollbackBean.java
--- src/ejb/org/apache/ojb/ejb/odmg/RollbackBean.java 11 Sep 2004 12:20:01
-0000 1.1.2.1
+++ src/ejb/org/apache/ojb/ejb/odmg/RollbackBean.java 29 Dec 2004 15:16:25
-0000
@@ -270,7 +270,7 @@
tx.flush();
Class searchClass = objectsToStore.get(0).getClass();
PersistenceBroker broker = tx.getBroker();
- Query q = new QueryByCriteria(searchClass, new Criteria());
+ Query q = new QueryByCriteria(searchClass);
// we get the iterator and step into the first found object
Iterator it = broker.getIteratorByQuery(q);
it.next();
Index: src/ejb/org/apache/ojb/ejb/pb/PBBaseBeanImpl.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PBBaseBeanImpl.java,v
retrieving revision 1.4
diff -u -r1.4 PBBaseBeanImpl.java
--- src/ejb/org/apache/ojb/ejb/pb/PBBaseBeanImpl.java 5 Apr 2004 00:17:08
-0000 1.4
+++ src/ejb/org/apache/ojb/ejb/pb/PBBaseBeanImpl.java 29 Dec 2004 15:16:25
-0000
@@ -94,7 +94,7 @@
int result;
try
{
- result = broker.getCount(new QueryByCriteria(target, null));
+ result = broker.getCount(new QueryByCriteria(target));
}
finally
{
@@ -112,7 +112,7 @@
Collection result;
try
{
- Query q = new QueryByCriteria(target, null);
+ Query q = new QueryByCriteria(target);
result = broker.getCollectionByQuery(q);
}
finally
Index: src/ejb/org/apache/ojb/ejb/pb/PBSessionBean.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PBSessionBean.java,v
retrieving revision 1.5.2.1
diff -u -r1.5.2.1 PBSessionBean.java
--- src/ejb/org/apache/ojb/ejb/pb/PBSessionBean.java 11 Sep 2004 12:20:01
-0000 1.5.2.1
+++ src/ejb/org/apache/ojb/ejb/pb/PBSessionBean.java 29 Dec 2004 15:16:25
-0000
@@ -134,7 +134,7 @@
protected int getCount(Class target)
{
PersistenceBroker broker = getBroker();
- int result = broker.getCount(new QueryByCriteria(target, null));
+ int result = broker.getCount(new QueryByCriteria(target));
broker.close();
return result;
}
@@ -146,7 +146,7 @@
{
if(log.isDebugEnabled()) log.debug("getAllObjects was called");
PersistenceBroker broker = getBroker();
- Query q = new QueryByCriteria(target, null);
+ Query q = new QueryByCriteria(target);
Collection result = broker.getCollectionByQuery(q);
broker.close();
return result;
@@ -159,7 +159,7 @@
{
if(log.isDebugEnabled()) log.debug("getAllObjects was called");
PersistenceBroker broker = getBroker();
- Query q = new QueryByCriteria(target, null);
+ Query q = new QueryByCriteria(target);
Iterator result = broker.getIteratorByQuery(q);
broker.close();
return result;
Index: src/ejb/org/apache/ojb/ejb/pb/PersonArticleManagerPBBean.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PersonArticleManagerPBBean.java,v
retrieving revision 1.5.2.2
diff -u -r1.5.2.2 PersonArticleManagerPBBean.java
--- src/ejb/org/apache/ojb/ejb/pb/PersonArticleManagerPBBean.java 11 Sep
2004 12:20:01 -0000 1.5.2.2
+++ src/ejb/org/apache/ojb/ejb/pb/PersonArticleManagerPBBean.java 29 Dec
2004 15:16:25 -0000
@@ -108,7 +108,7 @@
try
{
// do something with broker
- Query q = new QueryByCriteria(PersonVO.class, null);
+ Query q = new QueryByCriteria(PersonVO.class);
broker.getCollectionByQuery(q);
// System.out.println("## broker1: con=" +
broker.serviceConnectionManager().getConnection());
//now use nested bean call
Index: src/ejb/org/apache/ojb/ejb/pb/PersonManagerPBBean.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/pb/PersonManagerPBBean.java,v
retrieving revision 1.4
diff -u -r1.4 PersonManagerPBBean.java
--- src/ejb/org/apache/ojb/ejb/pb/PersonManagerPBBean.java 5 Apr 2004
00:17:08 -0000 1.4
+++ src/ejb/org/apache/ojb/ejb/pb/PersonManagerPBBean.java 29 Dec 2004
15:16:25 -0000
@@ -112,7 +112,7 @@
Criteria criteria = new Criteria();
if (firstname != null) criteria.addEqualTo("firstname", firstname);
if (lastname != null) criteria.addEqualTo("firstname", lastname);
- Query q = new QueryByCriteria(PersonVO.class, null);
+ Query q = new QueryByCriteria(PersonVO.class);
Collection result = broker.getCollectionByQuery(q);
broker.close();
return result;
Index: src/ejb/org/apache/ojb/ejb/pb/RollbackBean.java
===================================================================
RCS file:
/home/cvspublic/db-ojb/src/ejb/org/apache/ojb/ejb/pb/RollbackBean.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 RollbackBean.java
--- src/ejb/org/apache/ojb/ejb/pb/RollbackBean.java 11 Sep 2004 12:20:01
-0000 1.1.2.1
+++ src/ejb/org/apache/ojb/ejb/pb/RollbackBean.java 29 Dec 2004 15:16:25
-0000
@@ -213,7 +213,7 @@
PersistenceBroker broker = getBroker();
try
{
- Query q = new QueryByCriteria(searchClass, new Criteria());
+ Query q = new QueryByCriteria(searchClass);
// we get the iterator and step into the first found object
Iterator it = broker.getIteratorByQuery(q);
it.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
