Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 97598 invoked from network); 1 Nov 2006 17:49:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Nov 2006 17:49:09 -0000 Received: (qmail 26144 invoked by uid 500); 1 Nov 2006 17:49:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 26118 invoked by uid 500); 1 Nov 2006 17:49:20 -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 26107 invoked by uid 99); 1 Nov 2006 17:49:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 09:49:20 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 09:49:08 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id ABE4A1A984D; Wed, 1 Nov 2006 09:48:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470013 - /geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/properties/NamingPropertiesTest.java Date: Wed, 01 Nov 2006 17:48:44 -0000 To: scm@geronimo.apache.org From: rickmcguire@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061101174844.ABE4A1A984D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rickmcguire Date: Wed Nov 1 09:48:44 2006 New Revision: 470013 URL: http://svn.apache.org/viewvc?view=rev&rev=470013 Log: GERONIMO-1840 NamingPropertiesTest is not compatible with non-Sun VMs. Modified: geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/properties/NamingPropertiesTest.java Modified: geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/properties/NamingPropertiesTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/properties/NamingPropertiesTest.java?view=diff&rev=470013&r1=470012&r2=470013 ============================================================================== --- geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/properties/NamingPropertiesTest.java (original) +++ geronimo/server/trunk/modules/geronimo-system/src/test/java/org/apache/geronimo/system/properties/NamingPropertiesTest.java Wed Nov 1 09:48:44 2006 @@ -35,7 +35,13 @@ assertEquals(namingProperties.getNamingFactoryUrlPkgs(), FACTORY_URL_PKGS); assertEquals(namingProperties.getNamingProviderUrl(), PROVIDER_URL); - new InitialContext(); - + try { + // the above assumes we're running on a Sun JVM. If we can't load the class first, + // we'll skip the attempt at creating the InitialContext. We've already verified that the + // system properties have been set to the correct values, so this last bit is largely a formality. + Class.forName("NAME_FACTORY_INITIAL"); + new InitialContext(); + } catch (ClassNotFoundException e) { + } } }