You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2008/03/22 04:51:53 UTC
svn commit: r639948 - in /ibatis/trunk/java/mapper/mapper2: build/
src/com/ibatis/common/jdbc/logging/ src/com/ibatis/sqlmap/engine/builder/xml/
src/com/ibatis/sqlmap/engine/cache/ src/com/ibatis/sqlmap/engine/config/
src/com/ibatis/sqlmap/engine/conif...
Author: cbegin
Date: Fri Mar 21 20:51:52 2008
New Revision: 639948
URL: http://svn.apache.org/viewvc?rev=639948&view=rev
Log:
fixed issues 479, 467,445,433,456,489,485,419,392,309,365,413
Added:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/
- copied from r639547, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/CacheModelConfig.java
- copied, changed from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/CacheModelConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/MappedStatementConfig.java
- copied, changed from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ParameterMapConfig.java
- copied, changed from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ResultMapConfig.java
- copied, changed from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java
- copied, changed from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlSource.java
- copied, changed from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlSource.java
Removed:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/
Modified:
ibatis/trunk/java/mapper/mapper2/build/build.xml
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XmlParserState.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/ResultLoader.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/SqlText.java
Modified: ibatis/trunk/java/mapper/mapper2/build/build.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/build.xml?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/build.xml (original)
+++ ibatis/trunk/java/mapper/mapper2/build/build.xml Fri Mar 21 20:51:52 2008
@@ -12,7 +12,7 @@
</path>
<path id="sourcepath">
- <path refid="runtime.src"/>
+ <path refid="runtime.src"/>
<path refid="test.src"/>
</path>
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Fri Mar 21 20:51:52 2008
@@ -1,5 +1,5 @@
#Build version info
-#Thu Mar 20 10:18:10 CDT 2008
+#Fri Mar 21 19:27:28 MDT 2008
version=2.3.1
-buildDate=2008/03/20 10\:18
-buildNum=701
+buildDate=2008/03/21 19\:27
+buildNum=704
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/ResultSetLogProxy.java Fri Mar 21 20:51:52 2008
@@ -47,10 +47,11 @@
Object o = method.invoke(rs, params);
if (GET_METHODS.contains(method.getName())) {
if (params[0] instanceof String) {
- setColumn(params[0], o);
- // setColumn(params[0], rs.getObject((String) params[0]));
- // } else {
- // setColumn(params[0], rs.getObject(((Integer) params[0]).intValue()));
+ if(rs.wasNull()) {
+ setColumn(params[0], null);
+ } else {
+ setColumn(params[0], o);
+ }
}
} else if ("next".equals(method.getName()) || "close".equals(method.getName())) {
String s = getValueString();
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java Fri Mar 21 20:51:52 2008
@@ -3,7 +3,7 @@
import com.ibatis.common.resources.*;
import com.ibatis.common.xml.*;
import com.ibatis.sqlmap.client.*;
-import com.ibatis.sqlmap.engine.conifg.*;
+import com.ibatis.sqlmap.engine.config.*;
import com.ibatis.sqlmap.engine.transaction.*;
import com.ibatis.sqlmap.engine.datasource.*;
import com.ibatis.sqlmap.engine.mapping.result.*;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java Fri Mar 21 20:51:52 2008
@@ -3,7 +3,7 @@
import com.ibatis.common.xml.*;
import com.ibatis.common.resources.*;
import com.ibatis.sqlmap.client.*;
-import com.ibatis.sqlmap.engine.conifg.*;
+import com.ibatis.sqlmap.engine.config.*;
import com.ibatis.sqlmap.engine.mapping.statement.*;
import com.ibatis.sqlmap.engine.cache.*;
import org.w3c.dom.Node;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java Fri Mar 21 20:51:52 2008
@@ -2,7 +2,7 @@
import com.ibatis.common.xml.*;
import com.ibatis.common.resources.*;
-import com.ibatis.sqlmap.engine.conifg.*;
+import com.ibatis.sqlmap.engine.config.*;
import com.ibatis.sqlmap.engine.mapping.statement.*;
import com.ibatis.sqlmap.client.*;
import org.w3c.dom.CharacterData;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XMLSqlSource.java Fri Mar 21 20:51:52 2008
@@ -1,7 +1,7 @@
package com.ibatis.sqlmap.engine.builder.xml;
import com.ibatis.common.xml.*;
-import com.ibatis.sqlmap.engine.conifg.*;
+import com.ibatis.sqlmap.engine.config.*;
import com.ibatis.sqlmap.engine.mapping.parameter.*;
import com.ibatis.sqlmap.engine.mapping.sql.*;
import com.ibatis.sqlmap.engine.mapping.sql.dynamic.*;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XmlParserState.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XmlParserState.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XmlParserState.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/XmlParserState.java Fri Mar 21 20:51:52 2008
@@ -1,7 +1,7 @@
package com.ibatis.sqlmap.engine.builder.xml;
import com.ibatis.common.resources.*;
-import com.ibatis.sqlmap.engine.conifg.*;
+import com.ibatis.sqlmap.engine.config.*;
import javax.sql.DataSource;
import java.util.*;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java Fri Mar 21 20:51:52 2008
@@ -36,7 +36,7 @@
* This is used to represent null objects that are returned from the cache so
* that they can be cached, too.
*/
- public static final Object NULL_OBJECT = new Object();
+ public static final Object NULL_OBJECT = new String("SERIALIZABLE_NULL_OBJECT");
private int requests = 0;
private int hits = 0;
Copied: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/CacheModelConfig.java (from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/CacheModelConfig.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/CacheModelConfig.java?p2=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/CacheModelConfig.java&p1=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/CacheModelConfig.java&r1=639945&r2=639948&rev=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/CacheModelConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/CacheModelConfig.java Fri Mar 21 20:51:52 2008
@@ -1,4 +1,4 @@
-package com.ibatis.sqlmap.engine.conifg;
+package com.ibatis.sqlmap.engine.config;
import com.ibatis.sqlmap.engine.cache.*;
import com.ibatis.sqlmap.engine.impl.*;
@@ -34,14 +34,14 @@
errorContext.setObjectId(null);
}
- public void setFlushInterval(int hours, int minutes, int seconds, int milliseconds) {
+ public void setFlushInterval(long hours, long minutes, long seconds, long milliseconds) {
errorContext.setMoreInfo("Check the cache model flush interval.");
- long t = 0;
+ long t = 0L;
t += milliseconds;
- t += seconds * 1000;
- t += minutes * 60 * 1000;
- t += hours * 60 * 60 * 1000;
- if (t < 1)
+ t += seconds * 1000L;
+ t += minutes * 60L * 1000L;
+ t += hours * 60L * 60L * 1000L;
+ if (t < 1L)
throw new RuntimeException("A flush interval must specify one or more of milliseconds, seconds, minutes or hours.");
cacheModel.setFlushInterval(t);
}
Copied: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/MappedStatementConfig.java (from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/MappedStatementConfig.java?p2=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/MappedStatementConfig.java&p1=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java&r1=639945&r2=639948&rev=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/MappedStatementConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/MappedStatementConfig.java Fri Mar 21 20:51:52 2008
@@ -1,4 +1,4 @@
-package com.ibatis.sqlmap.engine.conifg;
+package com.ibatis.sqlmap.engine.config;
import com.ibatis.common.beans.*;
import com.ibatis.common.resources.*;
Copied: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ParameterMapConfig.java (from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ParameterMapConfig.java?p2=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ParameterMapConfig.java&p1=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java&r1=639945&r2=639948&rev=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ParameterMapConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ParameterMapConfig.java Fri Mar 21 20:51:52 2008
@@ -1,4 +1,4 @@
-package com.ibatis.sqlmap.engine.conifg;
+package com.ibatis.sqlmap.engine.config;
import com.ibatis.sqlmap.client.extensions.*;
import com.ibatis.sqlmap.engine.impl.*;
Copied: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ResultMapConfig.java (from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ResultMapConfig.java?p2=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ResultMapConfig.java&p1=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java&r1=639945&r2=639948&rev=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/ResultMapConfig.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/ResultMapConfig.java Fri Mar 21 20:51:52 2008
@@ -1,4 +1,4 @@
-package com.ibatis.sqlmap.engine.conifg;
+package com.ibatis.sqlmap.engine.config;
import com.ibatis.sqlmap.client.extensions.*;
import com.ibatis.sqlmap.engine.impl.*;
Copied: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java (from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java?p2=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java&p1=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java&r1=639945&r2=639948&rev=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlMapConfiguration.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlMapConfiguration.java Fri Mar 21 20:51:52 2008
@@ -1,4 +1,4 @@
-package com.ibatis.sqlmap.engine.conifg;
+package com.ibatis.sqlmap.engine.config;
import com.ibatis.common.beans.*;
import com.ibatis.common.resources.*;
Copied: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlSource.java (from r639945, ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlSource.java)
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlSource.java?p2=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlSource.java&p1=ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlSource.java&r1=639945&r2=639948&rev=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/conifg/SqlSource.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/config/SqlSource.java Fri Mar 21 20:51:52 2008
@@ -1,4 +1,4 @@
-package com.ibatis.sqlmap.engine.conifg;
+package com.ibatis.sqlmap.engine.config;
import com.ibatis.sqlmap.engine.mapping.sql.*;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java Fri Mar 21 20:51:52 2008
@@ -350,10 +350,10 @@
}
private boolean moveToNextResultsSafely(Statement stmt) throws SQLException {
- if (!stmt.getConnection().getMetaData().supportsMultipleResultSets()) {
- return false;
+ if (stmt.getConnection().getMetaData().supportsMultipleResultSets()) {
+ return stmt.getMoreResults();
}
- return stmt.getMoreResults();
+ return false;
}
private void handleResults(StatementScope statementScope, ResultSet rs, int skipResults, int maxResults, RowHandlerCallback callback) throws SQLException {
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/ResultLoader.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/ResultLoader.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/ResultLoader.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/ResultLoader.java Fri Mar 21 20:51:52 2008
@@ -19,10 +19,8 @@
import com.ibatis.sqlmap.engine.type.DomCollectionTypeMarker;
import java.sql.SQLException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.lang.reflect.Array;
/**
* Class to load results into objects
@@ -79,11 +77,19 @@
return value;
}
-
- private static Object[] listToArray(List list, Class type) {
+ private static Object listToArray(List list, Class type) {
Object array = java.lang.reflect.Array.newInstance(type, list.size());
- array = list.toArray((Object[]) array);
- return (Object[]) array;
+ if (type.isPrimitive()) {
+ Iterator iter = list.iterator();
+ int index = 0;
+ while (iter.hasNext()) {
+ Array.set(array, index++, iter.next());
+ }
+ } else {
+ array = list.toArray((Object[]) array);
+ }
+ return array;
+
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/SqlText.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/SqlText.java?rev=639948&r1=639947&r2=639948&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/SqlText.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/SqlText.java Fri Mar 21 20:51:52 2008
@@ -30,7 +30,7 @@
}
public void setText(String text) {
- this.text = text.replace('\r', ' ').replace('\n', ' ');
+ this.text = text.replace('\r', ' ').replace('\n', ' ').replace('\t', ' ');
this.isWhiteSpace = text.trim().length() == 0;
}