[Mulgara-svn] r1725 - trunk/src/jar/krule/java/org/mulgara/krule

[pag at mulgara.org]

Author: pag
Date: 2009-06-09 19:59:41 -0700 (Tue, 09 Jun 2009)
New Revision: 1725

Modified:
   trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java
Log:
Added an early abort while returning null for data that is not a valid Krule configuration

Modified: trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java
===================================================================
--- trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java	2009-06-09 19:18:41 UTC (rev 1724)
+++ trunk/src/jar/krule/java/org/mulgara/krule/KruleLoader.java	2009-06-10 02:59:41 UTC (rev 1725)
@@ -129,7 +129,7 @@
    * Reads the ruleModel in the database and constructs the rules from it.
    *
    * @param opContextParam The operationContext for querying on.
-   * @return A new rule structure.
+   * @return A new rule structure, or <code>null</code> if the rules are not a Krule structure.
    * @throws InitializerException There was a problem reading and creating the rules.
    */
   public Rules readRules(Object opContextParam) throws InitializerException, RemoteException {
@@ -141,6 +141,9 @@
       // load the objects
       loadRdfObjects();
 
+      // if there is not Krule data, then return null to indicate this loader cannot read these rules
+      if (uriReferences.isEmpty()) return null;
+
       if (logger.isDebugEnabled()) logger.debug("Querying for rules");
       rules = findRules();
       // set the target model
@@ -184,6 +187,10 @@
     // get all the URIReferences
     findUriReferences();
     if (logger.isDebugEnabled()) logger.debug("Got URI References");
+    if (uriReferences.isEmpty()) {
+      if (logger.isDebugEnabled()) logger.debug("No Krule data");
+      return;
+    }
     findVarReferences();
     if (logger.isDebugEnabled()) logger.debug("Got Variable references");
     findLiteralReferences();