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:28:20 UTC
svn commit: r1149774 -
/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Author: sagara
Date: Sat Jul 23 01:28:19 2011
New Revision: 1149774
URL: http://svn.apache.org/viewvc?rev=1149774&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=1149774&r1=1149773&r2=1149774&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:28:19 2011
@@ -38,15 +38,15 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.NavigableSet;
+//import java.util.NavigableSet;
import java.util.Queue;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.concurrent.BlockingDeque;
+//import java.util.concurrent.BlockingDeque;
import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingDeque;
+//import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
import javax.activation.DataHandler;
@@ -1851,17 +1851,20 @@ public class BeanUtil {
} else if (Queue.class.getName().equals(rowType.getName())) {
return new LinkedList<Object>();
- } else if (BlockingDeque.class.getName().equals(rowType.getName())) {
- return new LinkedBlockingDeque<Object>();
-
- } else if (BlockingQueue.class.getName().equals(rowType.getName())) {
+ } else if (BlockingQueue.class.getName().equals(rowType.getName())) {
return new LinkedBlockingQueue<Object>();
- } else if (NavigableSet.class.getName().equals(rowType.getName())
- || SortedSet.class.getName().equals(rowType.getName())) {
- return new TreeSet<Object>();
-
- } else {
+ }
+// TODO - Enable this logic once the Axis2 move to Java 1.6.
+// else if (BlockingDeque.class.getName().equals(rowType.getName())) {
+// return new LinkedBlockingDeque<Object>();
+//
+// }else if (NavigableSet.class.getName().equals(rowType.getName())
+// || SortedSet.class.getName().equals(rowType.getName())) {
+// return new TreeSet<Object>();
+//
+// }
+ else {
try {
return (Collection<Object>) rowType.newInstance();
} catch (Exception e) {