You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by io...@apache.org on 2011/12/02 23:43:58 UTC
svn commit: r1209755 - in /karaf/cellar/trunk:
bundle/src/main/java/org/apache/karaf/cellar/bundle/
config/src/main/java/org/apache/karaf/cellar/config/
features/src/main/java/org/apache/karaf/cellar/features/
hazelcast/src/main/java/org/apache/karaf/c...
Author: iocanel
Date: Fri Dec 2 22:43:57 2011
New Revision: 1209755
URL: http://svn.apache.org/viewvc?rev=1209755&view=rev
Log:
[KARAF-1034] Fixed destroy methods so that cellar can cleanly uninstall. Added some lifecycle and npe checks.
Modified:
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
Modified: karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java?rev=1209755&r1=1209754&r2=1209755&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java (original)
+++ karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleSynchronizer.java Fri Dec 2 22:43:57 2011
@@ -149,9 +149,11 @@ public class BundleSynchronizer extends
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
- String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
- String propertyValue = properties.get(propertyKey);
- result = Boolean.parseBoolean(propertyValue);
+ if (properties != null) {
+ String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
+ String propertyValue = properties.get(propertyKey);
+ result = Boolean.parseBoolean(propertyValue);
+ }
} catch (IOException e) {
LOGGER.error("CELLAR BUNDLE: error while checking if sync is enabled", e);
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1209755&r1=1209754&r2=1209755&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Fri Dec 2 22:43:57 2011
@@ -177,9 +177,11 @@ public class ConfigurationSynchronizer e
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
- String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
- String propertyValue = properties.get(propertyKey);
- result = Boolean.parseBoolean(propertyValue);
+ if (properties != null) {
+ String propertyKey = groupName + Configurations.SEPARATOR + Constants.CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
+ String propertyValue = properties.get(propertyKey);
+ result = Boolean.parseBoolean(propertyValue);
+ }
} catch (IOException e) {
LOGGER.error("CELLAR CONFIG: error while checking if sync is enabled", e);
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java?rev=1209755&r1=1209754&r2=1209755&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesSynchronizer.java Fri Dec 2 22:43:57 2011
@@ -178,9 +178,11 @@ public class FeaturesSynchronizer extend
try {
Configuration configuration = configurationAdmin.getConfiguration(Configurations.GROUP);
Dictionary<String, String> properties = configuration.getProperties();
- String propertyKey = groupName + Configurations.SEPARATOR + Constants.FEATURES_CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
- String propertyValue = properties.get(propertyKey);
- result = Boolean.parseBoolean(propertyValue);
+ if (properties != null) {
+ String propertyKey = groupName + Configurations.SEPARATOR + Constants.FEATURES_CATEGORY + Configurations.SEPARATOR + Configurations.SYNC;
+ String propertyValue = properties.get(propertyKey);
+ result = Boolean.parseBoolean(propertyValue);
+ }
} catch (IOException e) {
LOGGER.error("CELLAR FEATURES: error while checking if sync is enabled", e);
}
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java?rev=1209755&r1=1209754&r2=1209755&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/HazelcastClusterManager.java Fri Dec 2 22:43:57 2011
@@ -169,11 +169,15 @@ public class HazelcastClusterManager ext
}
public void stop() {
- instance.shutdown();
+ if (instance != null && instance.getLifecycleService().isRunning()) {
+ instance.getLifecycleService().shutdown();
+ }
}
public void restart() {
- instance.restart();
+ if (instance != null && instance.getLifecycleService().isRunning()) {
+ instance.getLifecycleService().restart();
+ }
}
public ConfigurationAdmin getConfigurationAdmin() {
Modified: karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java?rev=1209755&r1=1209754&r2=1209755&view=diff
==============================================================================
--- karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java (original)
+++ karaf/cellar/trunk/hazelcast/src/main/java/org/apache/karaf/cellar/hazelcast/QueueConsumer.java Fri Dec 2 22:43:57 2011
@@ -76,6 +76,7 @@ public class QueueConsumer<E extends Eve
* Destruction method.
*/
public void destroy() {
+ isConsuming = false;
if (queue != null) {
queue.removeItemListener(this);
}