You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2011/11/11 00:17:45 UTC
svn commit: r1200615 - in /karaf/trunk:
management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
Author: pieber
Date: Thu Nov 10 23:17:44 2011
New Revision: 1200615
URL: http://svn.apache.org/viewvc?rev=1200615&view=rev
Log:
Fixed JDK7 problems
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
Modified: karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java?rev=1200615&r1=1200614&r2=1200615&view=diff
==============================================================================
--- karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java (original)
+++ karaf/trunk/management/mbeans/config/src/main/java/org/apache/karaf/management/mbeans/config/internal/ConfigMBeanImpl.java Thu Nov 10 23:17:44 2011
@@ -183,12 +183,12 @@ public class ConfigMBeanImpl extends Sta
}
// remove "removed" properties from the file
ArrayList<String> propertiesToRemove = new ArrayList<String>();
- for (String key : p.keySet()) {
+ for (Object key : p.keySet()) {
if (properties.get(key) == null
&& !Constants.SERVICE_PID.equals(key)
&& !ConfigurationAdmin.SERVICE_FACTORYPID.equals(key)
&& !FELIX_FILEINSTALL_FILENAME.equals(key)) {
- propertiesToRemove.add(key);
+ propertiesToRemove.add(key.toString());
}
}
for (String key : propertiesToRemove) {
Modified: karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java?rev=1200615&r1=1200614&r2=1200615&view=diff
==============================================================================
--- karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java (original)
+++ karaf/trunk/shell/config/src/main/java/org/apache/karaf/shell/config/UpdateCommand.java Thu Nov 10 23:17:44 2011
@@ -77,12 +77,12 @@ public class UpdateCommand extends Confi
}
// remove "removed" properties from the file
ArrayList<String> propertiesToRemove = new ArrayList<String>();
- for (String key : p.keySet()) {
+ for (Object key : p.keySet()) {
if (props.get(key) == null
&& !Constants.SERVICE_PID.equals(key)
&& !ConfigurationAdmin.SERVICE_FACTORYPID.equals(key)
&& !FELIX_FILEINSTALL_FILENAME.equals(key)) {
- propertiesToRemove.add(key);
+ propertiesToRemove.add(key.toString());
}
}
for (String key : propertiesToRemove) {