[Mulgara-svn] r1728 - trunk/src/jar/swrl/java/org/mulgara/swrl

[alexhall at mulgara.org]

Author: alexhall
Date: 2009-06-10 09:44:10 -0700 (Wed, 10 Jun 2009)
New Revision: 1728

Modified:
   trunk/src/jar/swrl/java/org/mulgara/swrl/SWRLLoader.java
Log:
Add an early check to return null if no SWRL rules are found.

Modified: trunk/src/jar/swrl/java/org/mulgara/swrl/SWRLLoader.java
===================================================================
--- trunk/src/jar/swrl/java/org/mulgara/swrl/SWRLLoader.java	2009-06-10 03:01:30 UTC (rev 1727)
+++ trunk/src/jar/swrl/java/org/mulgara/swrl/SWRLLoader.java	2009-06-10 16:44:10 UTC (rev 1728)
@@ -146,12 +146,17 @@
     rules.setTargetModel(destGraph);
     
     try {
+      List<Node> ruleNodes = findRules();
+      if (ruleNodes.isEmpty()) {
+        logger.debug("No SWRL data.");
+        return null;
+      }
+      
+      if (logger.isDebugEnabled()) logger.debug("Found rules: " + ruleNodes);
+      
       Map<URIReference,Variable> vars = findVariables();
       if (logger.isDebugEnabled()) logger.debug("Found variables: " + vars);
       
-      List<Node> ruleNodes = findRules();
-      if (logger.isDebugEnabled()) logger.debug("Found rules: " + ruleNodes);
-      
       Map<Node,Pair<URI,ConstraintImpl>> constraintAtoms = new HashMap<Node,Pair<URI,ConstraintImpl>>();
       Map<Node,Pair<URI,Filter>> filterAtoms = new HashMap<Node,Pair<URI,Filter>>();
       findAtoms(constraintAtoms, filterAtoms, vars);