Return-Path: 
 <commits-return-13424-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.apache.org>
X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 233A5191A2
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Wed, 30 Mar 2016 13:59:42 +0000 (UTC)
Received: (qmail 6905 invoked by uid 500); 30 Mar 2016 13:59:41 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 6211 invoked by uid 500); 30 Mar 2016 13:59:39 -0000
Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.apache.org>
List-Post: <mailto:commits@brooklyn.apache.org>
List-Id: <commits.brooklyn.apache.org>
Reply-To: dev@brooklyn.apache.org
Delivered-To: mailing list commits@brooklyn.apache.org
Received: (qmail 5624 invoked by uid 99); 30 Mar 2016 13:59:39 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2016 13:59:39 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id A8C91E098D; Wed, 30 Mar 2016 13:59:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: heneveld@apache.org
To: commits@brooklyn.apache.org
Date: Wed, 30 Mar 2016 13:59:42 -0000
Message-Id: <6cf00aa3f51e46ab87e3a4047b7281ae@git.apache.org>
In-Reply-To: <d338dcb532b042e3b694fc84ef831e50@git.apache.org>
References: <d338dcb532b042e3b694fc84ef831e50@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/50] brooklyn-server git commit: Update call to ServiceLoader.load
 to match previous call pattern.

Update call to ServiceLoader.load to match previous call pattern.

(Previous in the sense of prior to the FrameworkLookup change.)


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/afcb689f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/afcb689f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/afcb689f

Branch: refs/heads/master
Commit: afcb689f0a31995a27c953abab73f4902d8f2754
Parents: 6c3c508
Author: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Authored: Wed Mar 16 12:43:38 2016 +0000
Committer: Geoff Macartney <geoff.macartney@cloudsoftcorp.com>
Committed: Wed Mar 16 12:43:38 2016 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/api/framework/FrameworkLookup.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/afcb689f/api/src/main/java/org/apache/brooklyn/api/framework/FrameworkLookup.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/framework/FrameworkLookup.java b/api/src/main/java/org/apache/brooklyn/api/framework/FrameworkLookup.java
index 32922b6..3dbe64f 100644
--- a/api/src/main/java/org/apache/brooklyn/api/framework/FrameworkLookup.java
+++ b/api/src/main/java/org/apache/brooklyn/api/framework/FrameworkLookup.java
@@ -111,9 +111,12 @@ public class FrameworkLookup {
         return result;
     }
 
-    private static <T> Iterable<T> lookupAllViaServiceLoader(Class<T> clazz, ClassLoader loader) {
+    private static <T> ServiceLoader<T> lookupAllViaServiceLoader(Class<T> clazz, ClassLoader loader) {
         LOG.debug("Looking up all " + clazz.getSimpleName() + "  via ServiceLoader");
 
+        if (null == loader) {
+            return ServiceLoader.load(clazz);
+        }
         return ServiceLoader.load(clazz, loader);
     }
 
@@ -134,7 +137,7 @@ public class FrameworkLookup {
         LOG.debug("Looking up " + clazz.getSimpleName() + "  via ServiceLoader");
 
         Maybe<T> result = Maybe.absent("No class " + clazz.getSimpleName() + " found with ServiceLoader");
-        ServiceLoader<T> LOADER = ServiceLoader.load(clazz, loader);
+        ServiceLoader<T> LOADER = lookupAllViaServiceLoader(clazz, loader);
         for (T item : LOADER) {
             return Maybe.of(item);
         }