felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1678788 - in /felix/trunk/configadmin: changelog.txt src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Date Mon, 11 May 2015 18:17:29 GMT
Author: cziegeler
Date: Mon May 11 18:17:28 2015
New Revision: 1678788

URL: http://svn.apache.org/r1678788
Log:
FELIX-4884 : listConfigurations should return null if no configuration is found

Modified:
    felix/trunk/configadmin/changelog.txt
    felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java

Modified: felix/trunk/configadmin/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/changelog.txt?rev=1678788&r1=1678787&r2=1678788&view=diff
==============================================================================
--- felix/trunk/configadmin/changelog.txt (original)
+++ felix/trunk/configadmin/changelog.txt Mon May 11 18:17:28 2015
@@ -1,5 +1,12 @@
+Changes from 1.8.4 to 1.8.6
+---------------------------
+
+** Bug
+    * [FELIX-4884] - listConfigurations should return null if no configuration is found
+
+
 Changes from 1.8.2 to 1.8.4
-----------------------------
+---------------------------
 
 ** Bug
     * [FELIX-4846] - Wrong exception type in list operation

Modified: felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java?rev=1678788&r1=1678787&r2=1678788&view=diff
==============================================================================
--- felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
(original)
+++ felix/trunk/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationManager.java
Mon May 11 18:17:28 2015
@@ -702,6 +702,10 @@ public class ConfigurationManager implem
             }
         }
 
+        if ( configList.size() == 0 )
+        {
+            return null;
+        }
         return ( ConfigurationImpl[] ) configList.toArray( new ConfigurationImpl[configList
             .size()] );
     }
@@ -1440,6 +1444,7 @@ public class ConfigurationManager implem
             managedServiceTracker.provideConfiguration( sr, configPid, null, properties,
revision, this.configs );
         }
 
+        @Override
         public String toString()
         {
             return "ManagedService Update: pid=" + Arrays.asList( pids );
@@ -1600,6 +1605,7 @@ public class ConfigurationManager implem
         }
 
 
+        @Override
         public String toString()
         {
             return "ManagedServiceFactory Update: factoryPid=" + Arrays.asList( this.factoryPids
);
@@ -1767,6 +1773,7 @@ public class ConfigurationManager implem
         }
 
 
+        @Override
         public String toString()
         {
             return "Update: pid=" + config.getPid();
@@ -1851,6 +1858,7 @@ public class ConfigurationManager implem
             }
         }
 
+        @Override
         public String toString()
         {
             return "Delete: pid=" + config.getPid();
@@ -1926,6 +1934,7 @@ public class ConfigurationManager implem
         }
 
 
+        @Override
         public String toString()
         {
             return "Location Changed (pid=" + config.getPid() + "): " + oldLocation + " ==>
"
@@ -2007,6 +2016,7 @@ public class ConfigurationManager implem
         }
 
 
+        @Override
         public String toString()
         {
             return "Fire ConfigurationEvent: pid=" + pid;



Mime
View raw message