Update of /var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten
In directory
james.mmbase.org:/tmp/cvs-serv26691/src/nl/natuurmonumenten/activiteiten
Modified Files:
Tag: BRANCH_NATMM_1_2
ActiviteitenService.java
Log Message:
NMCMS-622 - check op NotFoundException toegevoegd, er wordt nu null terug
gegeven
See also:
http://cvs.mmbase.org/viewcvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten
See also: http://www.mmbase.org/jira/browse/NMCMS-622
Index: ActiviteitenService.java
===================================================================
RCS file:
/var/cvs/contributions/natmm/src/nl/natuurmonumenten/activiteiten/Attic/ActiviteitenService.java,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- ActiviteitenService.java 19 Jan 2009 13:55:47 -0000 1.1.2.6
+++ ActiviteitenService.java 30 Jan 2009 10:49:39 -0000 1.1.2.7
@@ -15,6 +15,7 @@
import org.mmbase.bridge.NodeIterator;
import org.mmbase.bridge.NodeList;
import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.NotFoundException;
import org.mmbase.bridge.RelationList;
/**
@@ -175,7 +176,14 @@
public EventDetails getEventDetails(String id) {
logger.debug("getEventDetails");
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
- Node node = cloud.getNode(id);
+ Node node;
+ try {
+ node = cloud.getNode(id);
+ } catch (NotFoundException ex) {
+ logger.debug("Node niet gevonden: " + id);
+ return null;
+ }
+ // alleen evenementen mogen worden opgevraagd
if (!"evenement".equals(node.getNodeManager().getName())) {
logger.debug("Geen evenement: " + id);
return null;
@@ -199,9 +207,14 @@
public String subscribeEvent(Subscription subscription) {
// code komt uit SubscribeAction
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
- Node eventNode = cloud.getNode(subscription.getEvenementId());
+ Node eventNode;
+ try {
+ eventNode = cloud.getNode(subscription.getEvenementId());
+ } catch (NotFoundException ex) {
+ throw new IllegalArgumentException("Evenement id bestaat niet: " +
subscription.getEvenementId(), ex);
+ }
if (eventNode == null) {
- throw new IllegalArgumentException("Evenement id does not exist: "
+ subscription.getEvenementId());
+ throw new IllegalArgumentException("Evenement id bestaat niet: " +
subscription.getEvenementId());
}
NodeManager manager = cloud.getNodeManager("inschrijvingen");
Node subscriptionNode = manager.createNode();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
