You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2013/03/19 23:48:24 UTC
svn commit: r1458556 - in /karaf/cellar/trunk:
bundle/src/main/java/org/apache/karaf/cellar/bundle/
config/src/main/java/org/apache/karaf/cellar/config/
event/src/main/java/org/apache/karaf/cellar/event/
features/src/main/java/org/apache/karaf/cellar/f...
Author: anierbeck
Date: Tue Mar 19 22:48:23 2013
New Revision: 1458556
URL: http://svn.apache.org/r1458556
Log:
[KARAF-1474] - Fix Cellar itests
----
first steps to fix the itests ....
Modified:
karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java
karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
Modified: karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java (original)
+++ karaf/cellar/trunk/bundle/src/main/java/org/apache/karaf/cellar/bundle/BundleEventHandler.java Tue Mar 19 22:48:23 2013
@@ -47,6 +47,12 @@ public class BundleEventHandler extends
LOGGER.warn("CELLAR BUNDLE: {} switch is OFF, cluster event is not handled", SWITCH_ID);
return;
}
+
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", event);
+ return;
+ }
// check if the group is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java Tue Mar 19 22:48:23 2013
@@ -48,6 +48,12 @@ public class ConfigurationEventHandler e
LOGGER.warn("CELLAR CONFIG: {} switch is OFF, cluster event not handled", SWITCH_ID);
return;
}
+
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", event);
+ return;
+ }
// check if the group is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
Modified: karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java (original)
+++ karaf/cellar/trunk/event/src/main/java/org/apache/karaf/cellar/event/RemoteEventHandler.java Tue Mar 19 22:48:23 2013
@@ -40,6 +40,12 @@ public class RemoteEventHandler extends
LOGGER.warn("CELLAR EVENT: {} is OFF, cluster event not handled", SWITCH_ID);
return;
}
+
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", event);
+ return;
+ }
// check if the group is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/FeaturesEventHandler.java Tue Mar 19 22:48:23 2013
@@ -60,6 +60,12 @@ public class FeaturesEventHandler extend
return;
}
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", event);
+ return;
+ }
+
// check if the group is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
LOGGER.debug("CELLAR FEATURES: node is not part of the event cluster group");
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RemoteRepositoryEvent.java Tue Mar 19 22:48:23 2013
@@ -21,7 +21,11 @@ import org.apache.karaf.features.Reposit
*/
public class RemoteRepositoryEvent extends Event {
- private EventType type;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+ private EventType type;
public RemoteRepositoryEvent(String id, EventType type) {
super(id);
@@ -32,4 +36,15 @@ public class RemoteRepositoryEvent exten
return type;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ @Override
+ public String toString() {
+ return "RemoteRepositoryEvent [type=" + type + ", id=" + id
+ + ", sourceNode=" + sourceNode + ", sourceGroup=" + sourceGroup
+ + ", destination=" + destination + ", force=" + force
+ + ", postPublish=" + postPublish + "]";
+ }
+
}
Modified: karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java (original)
+++ karaf/cellar/trunk/features/src/main/java/org/apache/karaf/cellar/features/RepositoryEventHandler.java Tue Mar 19 22:48:23 2013
@@ -45,12 +45,18 @@ public class RepositoryEventHandler exte
}
public void handle(RemoteRepositoryEvent event) {
-
- // check if the handler is ON
+
+ // check if the handler is ON
if (eventSwitch.getStatus().equals(SwitchStatus.OFF)) {
- LOGGER.warn("CELLAR FEATURES: {} switch is OFF, cluster event is not handled", SWITCH_ID);
+ LOGGER.error("CELLAR FEATURES: {} switch is OFF, cluster event is not handled", SWITCH_ID);
return;
}
+
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", event);
+ return;
+ }
// check if the group is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrBundleEventHandler.java Tue Mar 19 22:48:23 2013
@@ -119,6 +119,12 @@ public class ObrBundleEventHandler exten
return;
}
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", event);
+ return;
+ }
+
// check if the group is local
if (!groupManager.isLocalGroup(event.getSourceGroup().getName())) {
LOGGER.debug("CELLAR OBR: node is not part of the event cluster group");
Modified: karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java?rev=1458556&r1=1458555&r2=1458556&view=diff
==============================================================================
--- karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java (original)
+++ karaf/cellar/trunk/obr/src/main/java/org/apache/karaf/cellar/obr/ObrUrlEventHandler.java Tue Mar 19 22:48:23 2013
@@ -58,6 +58,12 @@ public class ObrUrlEventHandler extends
return;
}
+ if (groupManager == null) {
+ //in rare cases for example right after installation this happens!
+ LOGGER.error("CELLAR FEATURES: retrieved event {} while groupManager is not available yet!", obrUrlEvent);
+ return;
+ }
+
// check if the group is local
if (!groupManager.isLocalGroup(obrUrlEvent.getSourceGroup().getName())) {
LOGGER.debug("CELLAR OBR: node is not part of the event cluster group");