arminw 2005/09/05 16:42:56
Modified: src/java/org/apache/ojb/broker/util/sequence Tag:
OJB_1_0_RELEASE SequenceManagerHelper.java
Log:
fix bug, wrong usage of Boolean method
code cleanup
Revision Changes Path
No revision
No revision
1.17.2.6 +6 -6
db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerHelper.java
Index: SequenceManagerHelper.java
===================================================================
RCS file:
/home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerHelper.java,v
retrieving revision 1.17.2.5
retrieving revision 1.17.2.6
diff -u -r1.17.2.5 -r1.17.2.6
--- SequenceManagerHelper.java 22 Aug 2005 15:27:29 -0000 1.17.2.5
+++ SequenceManagerHelper.java 5 Sep 2005 23:42:56 -0000 1.17.2.6
@@ -141,7 +141,7 @@
/*
check for inheritance on multiple table
*/
- cldTargetClass = findInheritanceRoot(brokerForClass, cldTargetClass);
+ cldTargetClass = findInheritanceRoot(cldTargetClass);
Class topLevel =
brokerForClass.getTopLevelClass(cldTargetClass.getClassOfObject());
ClassDescriptor cldTopLevel =
brokerForClass.getClassDescriptor(topLevel);
/**
@@ -202,12 +202,12 @@
* hierachy of the given descriptor or the descriptor itself if no
inheriatance on multiple table is
* used.
*/
- private static ClassDescriptor findInheritanceRoot(PersistenceBroker
broker, ClassDescriptor cld)
+ private static ClassDescriptor findInheritanceRoot(ClassDescriptor cld)
{
ClassDescriptor result = cld;
if(cld.getSuperClassDescriptor() != null)
{
- result = findInheritanceRoot(broker,
cld.getSuperClassDescriptor());
+ result = findInheritanceRoot(cld.getSuperClassDescriptor());
}
return result;
}
@@ -491,7 +491,7 @@
String result = prop.getProperty(PROP_SEQ_CYCLE, null);
if(result != null)
{
- return Boolean.getBoolean(result) ? Boolean.TRUE : Boolean.FALSE;
+ return Boolean.valueOf(result);
}
else
{
@@ -512,7 +512,7 @@
String result = prop.getProperty(PROP_SEQ_ORDER, null);
if(result != null)
{
- return Boolean.getBoolean(result) ? Boolean.TRUE : Boolean.FALSE;
+ return Boolean.valueOf(result);
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
