commit 72529742c82cd5b60b4219c2acc3557851b75be4
author Carsten Ziegeler <cziegeler@apache.org> Thu Jan 07 10:23:52 2010 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Thu Jan 07 10:23:52 2010 +0000
tree 370e899cd033222813108f2f051f7d29777ca1d6
parent be02f2433b2c0f79ced56de0fca54bf0f26bc6d3

SLING-1275 : Return value of ComponentContext#locateContext should be checked for null value

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@896837 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java

diff --git a/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java b/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
index c28fa73..6ebba7f 100644
--- a/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
+++ b/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java
@@ -274,7 +274,9 @@
 
         AdapterFactory factory = (AdapterFactory) context.locateService(
             "AdapterFactory", reference);
-
+        if ( factory == null ) {
+            return;
+        }
         AdapterFactoryDescriptorKey factoryKey = new AdapterFactoryDescriptorKey(
             reference);
         AdapterFactoryDescriptor factoryDesc = new AdapterFactoryDescriptor(