Author: arminw Date: Tue Nov 7 07:20:21 2006 New Revision: 472138 URL: http://svn.apache.org/viewvc?view=rev&rev=472138 Log: change initializing order
Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java Modified: db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java URL: http://svn.apache.org/viewvc/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java?view=diff&rev=472138&r1=472137&r2=472138 ============================================================================== --- db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java (original) +++ db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java Tue Nov 7 07:20:21 2006 @@ -213,7 +213,6 @@ /* be careful when changing initializing order */ - brokerHelper = new BrokerHelper(this); connectionManager = ConnectionManagerFactory.getInstance().createConnectionManager(this); /* TODO: find better solution @@ -238,6 +237,7 @@ referencesBroker = new QueryReferenceBroker(this); relationshipPrefetcherFactory = new RelationshipPrefetcherFactory(this); proxyFactory = AbstractProxyFactory.getProxyFactory(); + brokerHelper = new BrokerHelper(this); collectionTypes = new CollectionTypes(); } @@ -1986,7 +1986,7 @@ { // BRJ: fk values may be part of pk, but the are not known during // creation of Identity. so we have to get them here - pkValues = serviceBrokerHelper().getKeyValues(cld, obj); + pkValues = serviceBrokerHelper().extractValueArray(serviceBrokerHelper().getKeyValues(cld, obj, false)); if (!serviceBrokerHelper().assertValidPksForStore(cld.getPkFields(), pkValues)) { String append = insert ? " on insert" : " on update" ; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]