You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sa...@apache.org on 2011/07/23 03:43:16 UTC
svn commit: r1149776 -
/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara
Date: Sat Jul 23 01:43:15 2011
New Revision: 1149776
URL: http://svn.apache.org/viewvc?rev=1149776&view=rev
Log:
Disable some Java 1.6 specific logic when getting new Collection instance.
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1149776&r1=1149775&r2=1149776&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Sat Jul 23 01:43:15 2011
@@ -46,6 +46,8 @@ import java.util.TreeMap;
import java.util.TreeSet;
//import java.util.concurrent.BlockingDeque;
import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
//import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
@@ -1575,7 +1577,12 @@ public class BeanUtil {
if (Map.class.getName().equals(rowType.getName())) {
return new HashMap<Object, Object>();
- } else {
+
+ } else if (ConcurrentMap.class.getName().equals(rowType.getName())) {
+ return new ConcurrentHashMap<Object, Object>();
+ }
+
+ else {
try {
return (Map<Object, Object>) rowType.newInstance();
} catch (Exception e) {