commit e6f751b2f56d80821e96bf1aa6d263f88ed7697b
author Richard S. Hall <rickhall@apache.org> Fri Jun 19 15:05:53 2009 +0000
committer Richard S. Hall <rickhall@apache.org> Fri Jun 19 15:05:53 2009 +0000
tree 74eb8cdd0ad95aa22fdf40cae2ad1f4ca18114b8
parent 964233832190cb51f23fb2a06ff16ed1a87af222

Modify FilterImpl to handle null dictionary/service reference objects.
(FELIX-1255)


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

framework/src/main/java/org/apache/felix/framework/FilterImpl.java

diff --git a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
index 4b7abfb..840901f 100644
--- a/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
+++ b/framework/src/main/java/org/apache/felix/framework/FilterImpl.java
@@ -306,11 +306,11 @@
 
         public Object lookup(String name)
         {
-            if (m_map == null)
+            if (m_ref != null)
             {
                 return m_ref.getProperty(name);
             }
-            return m_map.get(name);
+            return (m_map != null) ? m_map.get(name) : null;
         }
     }
 }
\ No newline at end of file