Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A484D10234 for ; Tue, 21 Jan 2014 14:11:45 +0000 (UTC) Received: (qmail 31151 invoked by uid 500); 21 Jan 2014 14:11:44 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 31046 invoked by uid 500); 21 Jan 2014 14:11:35 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 31037 invoked by uid 99); 21 Jan 2014 14:11:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Jan 2014 14:11:34 +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; Tue, 21 Jan 2014 14:11:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A8C8D2388860; Tue, 21 Jan 2014 14:11:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1560022 - /sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Date: Tue, 21 Jan 2014 14:11:11 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140121141111.A8C8D2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Tue Jan 21 14:11:11 2014 New Revision: 1560022 URL: http://svn.apache.org/r1560022 Log: SLING-3328 - simplify testing against an existing Sling instance. Patch contributed by Jörg Hoh, thanks! Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Modified: sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java?rev=1560022&r1=1560021&r2=1560022&view=diff ============================================================================== --- sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java (original) +++ sling/trunk/testing/tools/src/main/java/org/apache/sling/testing/tools/sling/SlingTestBase.java Tue Jan 21 14:11:11 2014 @@ -74,22 +74,22 @@ public class SlingTestBase { /** Get configuration but do not start server yet, that's done on demand */ public SlingTestBase() { - if(jarExecutor == null) { - synchronized(this) { - try { - jarExecutor = new JarExecutor(System.getProperties()); - } catch(Exception e) { - log.error("JarExecutor setup failed", e); - fail("JarExecutor setup failed: " + e); - } - } - } final String configuredUrl = System.getProperty(TEST_SERVER_URL_PROP, System.getProperty("launchpad.http.server.url")); if(configuredUrl != null) { serverBaseUrl = configuredUrl; serverStarted = true; } else { + if(jarExecutor == null) { + synchronized(this) { + try { + jarExecutor = new JarExecutor(System.getProperties()); + } catch(Exception e) { + log.error("JarExecutor setup failed", e); + fail("JarExecutor setup failed: " + e); + } + } + } String serverHost = System.getProperty(SERVER_HOSTNAME_PROP); if(serverHost == null || serverHost.trim().length() == 0) { serverHost = "localhost";