From 7c5ae2787df19c5fa06b5da33c6db134ddf1ec91 Mon Sep 17 00:00:00 2001 From: norman Date: Thu, 26 Apr 2012 15:31:04 +0200 Subject: [PATCH] Make sure netty detects the right java version when running on android. See #282 --- .../java/org/jboss/netty/util/internal/DetectionUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jboss/netty/util/internal/DetectionUtil.java b/src/main/java/org/jboss/netty/util/internal/DetectionUtil.java index 90f827656b..7f5a98398d 100644 --- a/src/main/java/org/jboss/netty/util/internal/DetectionUtil.java +++ b/src/main/java/org/jboss/netty/util/internal/DetectionUtil.java @@ -71,11 +71,11 @@ public final class DetectionUtil { private static int javaVersion0() { try { - // Check if its android, if so handle it the same way as java5. + // Check if its android, if so handle it the same way as java6. // // See https://github.com/netty/netty/issues/282 Class.forName("android.app.Application"); - return 5; + return 6; } catch (ClassNotFoundException e) { //Ignore }