andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Use reflection to instance java.util.concurrent.LinkedTransferQueue to make Android not fail. See #458"

Browse Source 
This reverts commit 7a87a18c9b11872a21142b2e9dafdf3649775583.
This commit is contained in:
norman 2012-07-18 09:11:53 +02:00
parent 7a87a18c9b
commit 37375708c1
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/jboss/netty/util/internal/QueueFactory.java
View File

@ -41,16 +41,14 @@ public final class QueueFactory {
* @param itemClass the {@link Class} type which will be used as {@link BlockingQueue} items * @param itemClass the {@link Class} type which will be used as {@link BlockingQueue} items
* @return queue the {@link BlockingQueue} implementation * @return queue the {@link BlockingQueue} implementation
*/ */
@SuppressWarnings("unchecked")
public static <T> BlockingQueue<T> createQueue(Class<T> itemClass) { public static <T> BlockingQueue<T> createQueue(Class<T> itemClass) {
// if we run in java >=7 its the best to just use the LinkedTransferQueue which
// comes with java bundled. See #273
if (DetectionUtil.javaVersion() >= 7) {
return new java.util.concurrent.LinkedTransferQueue<T>();
}
try { try {
// if we run in java >=7 its the best to just use the LinkedTransferQueue which
// comes with java bundled. See #273
if (DetectionUtil.javaVersion() >= 7) {
// Use reflect as android otherwise will panic out. See #458
return (BlockingQueue<T>) QueueFactory.class.getClassLoader()
.loadClass("java.util.concurrent.LinkedTransferQueue").newInstance();
}
if (useUnsafe) { if (useUnsafe) {
return new LinkedTransferQueue<T>(); return new LinkedTransferQueue<T>();
} }
@ -77,16 +75,13 @@ public final class QueueFactory {
* @return queue the {@link BlockingQueue} implementation * @return queue the {@link BlockingQueue} implementation
*/ */
public static <T> BlockingQueue<T> createQueue(Collection<? extends T> collection, Class<T> itemClass) { public static <T> BlockingQueue<T> createQueue(Collection<? extends T> collection, Class<T> itemClass) {
// if we run in java >=7 its the best to just use the LinkedTransferQueue which
// comes with java bundled. See #273
if (DetectionUtil.javaVersion() >= 7) {
return new java.util.concurrent.LinkedTransferQueue<T>();
}
try { try {
// if we run in java >=7 its the best to just use the LinkedTransferQueue which
// comes with java bundled. See #273
if (DetectionUtil.javaVersion() >= 7) {
// Use reflect as android otherwise will panic out. See #458
@SuppressWarnings("unchecked")
Class<BlockingQueue<T>> clazz = (Class<BlockingQueue<T>>) QueueFactory.class.getClassLoader()
.loadClass("java.util.concurrent.LinkedTransferQueue");
return clazz.getConstructor(Collection.class).newInstance(collection);
}
if (useUnsafe) { if (useUnsafe) {
return new LinkedTransferQueue<T>(collection); return new LinkedTransferQueue<T>(collection);
} }
@ -104,5 +99,4 @@ public final class QueueFactory {
return new LegacyLinkedTransferQueue<T>(collection); return new LegacyLinkedTransferQueue<T>(collection);
} }
} }