commit 3f4f0f4ec0c27569c4180ac6911f17e9595d467c
author Carsten Ziegeler <cziegeler@apache.org> Fri Oct 09 08:55:36 2009 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Oct 09 08:55:36 2009 +0000
tree 83e0a9911a1f2e50823afacaac22d58e288c0e81
parent d55d17d1491b79e510f6f29c103e2841e4c4f3ab

SLING-1143 : Prevent NPE when adapter manager service is not running.

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

src/main/java/org/apache/sling/adapter/SlingAdaptable.java

diff --git a/src/main/java/org/apache/sling/adapter/SlingAdaptable.java b/src/main/java/org/apache/sling/adapter/SlingAdaptable.java
index 6d92fa9..c2bf3bf 100644
--- a/src/main/java/org/apache/sling/adapter/SlingAdaptable.java
+++ b/src/main/java/org/apache/sling/adapter/SlingAdaptable.java
@@ -20,6 +20,7 @@
 
 import org.apache.sling.adapter.internal.AdapterManagerImpl;
 import org.apache.sling.api.adapter.Adaptable;
+import org.apache.sling.api.adapter.AdapterManager;
 
 /**
  * The <code>SlingAdaptable</code> class is an (abstract) default
@@ -34,7 +35,8 @@
 public abstract class SlingAdaptable implements Adaptable {
 
     public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
-        return AdapterManagerImpl.getInstance().getAdapter(this, type);
+        final AdapterManager mgr = AdapterManagerImpl.getInstance();
+        return (mgr == null ? null : mgr.getAdapter(this, type));
     }
 
 }