Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 98B0B9E3F for ; Wed, 30 May 2012 01:39:40 +0000 (UTC) Received: (qmail 36837 invoked by uid 500); 30 May 2012 01:39:40 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 36771 invoked by uid 500); 30 May 2012 01:39:39 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 36759 invoked by uid 99); 30 May 2012 01:39:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 01:39:39 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 01:39:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 659EF23889BB; Wed, 30 May 2012 01:39:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1344070 - /geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java Date: Wed, 30 May 2012 01:39:16 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120530013916.659EF23889BB@eris.apache.org> Author: gawor Date: Wed May 30 01:39:15 2012 New Revision: 1344070 URL: http://svn.apache.org/viewvc?rev=1344070&view=rev Log: GERONIMO-6199: Some Java vendor have less than six characters Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java?rev=1344070&r1=1344069&r2=1344070&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java (original) +++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/properties/JvmVendor.java Wed May 30 01:39:15 2012 @@ -44,10 +44,10 @@ public class JvmVendor { static { String fullVendorName = getFullName(); - boolean bApache = fullVendorName.substring(0, 6).equalsIgnoreCase("Apache"); // aka. Apache Harmony - boolean bIBM = fullVendorName.substring(0, 3).equalsIgnoreCase("IBM"); // aka. IBM, but not IBM Hybrid - boolean bSun = !bIBM && !bApache; // default all others to Sun - boolean bHP = fullVendorName.substring(0, 6).equalsIgnoreCase("Hewlet"); // aka. Hewlett-Packard Company + boolean bApache = fullVendorName.regionMatches(true, 0, "Apache", 0, 6); // aka. Apache Harmony + boolean bIBM = fullVendorName.regionMatches(true, 0, "IBM", 0, 3); // aka. IBM, but not IBM Hybrid + boolean bSun = !bIBM && !bApache; // default all others to Sun + boolean bHP = fullVendorName.regionMatches(true, 0, "Hewlett", 0, 7); // aka. Hewlett-Packard Company boolean bIBMHybrid = false; // Special code for IBM Hybrid SDK (Sun JVM with IBM extensions on Solaris and HP-UX)