Author: arminw
Date: Mon Feb 13 03:31:38 2006
New Revision: 377346
URL: http://svn.apache.org/viewcvs?rev=377346&view=rev
Log:
remove JDK 1.4 dependencies
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/WriteDataToDatabaseCommand.java
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/WriteDataToDatabaseCommand.java
URL:
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/WriteDataToDatabaseCommand.java?rev=377346&r1=377345&r2=377346&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/WriteDataToDatabaseCommand.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/ant/WriteDataToDatabaseCommand.java
Mon Feb 13 03:31:38 2006
@@ -82,7 +82,7 @@
*/
public void setUseBatchMode(boolean useBatchMode)
{
- _useBatchMode = Boolean.valueOf(useBatchMode);
+ _useBatchMode = useBatchMode ? Boolean.TRUE : Boolean.FALSE;
}
/**
@@ -134,8 +134,8 @@
* Reads a single data file.
*
* @param task The parent task
- * @param reader The data reader
- * @param schemaFile The schema file
+ * @param handling The data reader
+ * @param dataFile The schema file
*/
private void readSingleDataFile(Task task, DdlUtilsDataHandling handling,
File dataFile)
{
Modified:
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java
URL:
http://svn.apache.org/viewcvs/db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java?rev=377346&r1=377345&r2=377346&view=diff
==============================================================================
---
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java
(original)
+++
db/ojb/branches/OJB_1_0_RELEASE/src/java/org/apache/ojb/broker/locking/LockManagerInMemoryImpl.java
Mon Feb 13 03:31:38 2006
@@ -18,11 +18,11 @@
import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.collections.list.TreeList;
+import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.lang.SystemUtils;
import org.apache.ojb.broker.util.configuration.Configurable;
import org.apache.ojb.broker.util.configuration.Configuration;
@@ -48,7 +48,7 @@
* while still maintaining an O(1) lookup like a normal hashmap. We can
then
* use this to get the oldest entries very quickly, makes cleanup a breeze.
*/
- private final Map resourceLockMap = new LinkedHashMap(70);
+ private final Map resourceLockMap = new LinkedMap(70);
private final Map keyLockMap = new HashMap();
private final LockIsolationManager lockStrategyManager = new
LockIsolationManager();
private long m_lastCleanupAt = System.currentTimeMillis();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
