[MMBASE SCM] r40701 - mmbase/branches/MMBase-1_8/src/org/mmbase/bridge/util

[michiel]

Author: michiel
Date: 2010-01-22 15:44:01 +0100 (Fri, 22 Jan 2010)
New Revision: 40701

Modified:
   mmbase/branches/MMBase-1_8/src/org/mmbase/bridge/util/CloneUtil.java
Log:
replaced NPE with something more informative

Modified: mmbase/branches/MMBase-1_8/src/org/mmbase/bridge/util/CloneUtil.java
===================================================================
--- mmbase/branches/MMBase-1_8/src/org/mmbase/bridge/util/CloneUtil.java        
2010-01-22 14:22:58 UTC (rev 40700)
+++ mmbase/branches/MMBase-1_8/src/org/mmbase/bridge/util/CloneUtil.java        
2010-01-22 14:44:01 UTC (rev 40701)
@@ -163,13 +163,18 @@
         if (sourceRelation instanceof Relation) {
             Relation localRel = (Relation) sourceRelation;
             relationManager = localRel.getRelationManager();
-        }
-        else {
+            if (relationManager == null) {
+                throw new NotFoundException("Node " + localRel + " has no 
relationmanager");
+          }
+        } else {
             Node relationTypeNode = sourceRelation.getNodeValue("rnumber");
             String relName = relationTypeNode.getStringValue("sname");
             relationManager = 
sourceRelation.getCloud().getRelationManager(sourceNode.getNodeManager().getName(),
                                                
destNode.getNodeManager().getName(),
                                                relName);
+            if (relationManager == null) {
+                throw new NotFoundException("No such relation manager " + 
sourceNode.getNodeManager().getName() + " -" + relName + "-> " + 
destNode.getNodeManager().getName());
+            }
         }
         Relation newRelation = relationManager.createRelation(sourceNode, 
destNode);
 

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs