You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by da...@apache.org on 2017/04/20 11:15:35 UTC

svn commit: r1792040 - in /felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl: ResourceImpl.java wrapper/ResolverWrapper.java

Author: davidb
Date: Thu Apr 20 11:15:35 2017
New Revision: 1792040

URL: http://svn.apache.org/viewvc?rev=1792040&view=rev
Log:
FELIX-5617 Remove "null" from console messages

Patch applied on behalf of Cristiano Gavi�o with many thanks!
This closes https://github.com/apache/felix/pull/104

Modified:
    felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResourceImpl.java
    felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/wrapper/ResolverWrapper.java

Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResourceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResourceImpl.java?rev=1792040&r1=1792039&r2=1792040&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResourceImpl.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/ResourceImpl.java Thu Apr 20 11:15:35 2017
@@ -102,7 +102,8 @@ public class ResourceImpl implements Res
 
     public String getPresentationName()
     {
-        return (String) m_map.get(PRESENTATION_NAME);
+        String pres = (String) m_map.get(PRESENTATION_NAME);
+        return (pres!=null && !pres.isEmpty())? pres : toString();
     }
 
     public String getSymbolicName()

Modified: felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/wrapper/ResolverWrapper.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/wrapper/ResolverWrapper.java?rev=1792040&r1=1792039&r2=1792040&view=diff
==============================================================================
--- felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/wrapper/ResolverWrapper.java (original)
+++ felix/trunk/bundlerepository/src/main/java/org/apache/felix/bundlerepository/impl/wrapper/ResolverWrapper.java Thu Apr 20 11:15:35 2017
@@ -56,7 +56,7 @@ public class ResolverWrapper implements
         Reason[] r = resolver.getReason(Wrapper.unwrap(resource));
         if (r == null)
         {
-            return null;
+            return new org.osgi.service.obr.Requirement[0];
         }
         Requirement[] r2 = new Requirement[r.length];
         for (int reaIdx = 0; reaIdx < r.length; reaIdx++)
@@ -76,7 +76,7 @@ public class ResolverWrapper implements
         List l = (List) map.get(requirement);
         if (l == null)
         {
-            return null;
+            return new org.osgi.service.obr.Resource[0];
         }
         return (org.osgi.service.obr.Resource[]) l.toArray(new org.osgi.service.obr.Resource[l.size()]);
     }