[Mulgara-svn] r717 - in trunk/src/jar: query/java/org/mulgara/server resolver/java/org/mulgara/resolver

[pag at mulgara.org]

Author: pag
Date: 2008-03-26 19:43:41 -0700 (Wed, 26 Mar 2008)
New Revision: 717

Modified:
   trunk/src/jar/query/java/org/mulgara/server/Session.java
   trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java
   trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
Log:
Removed the erroneous addition of RemoteException to the applyRules method

Modified: trunk/src/jar/query/java/org/mulgara/server/Session.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/server/Session.java	2008-03-27 02:26:01 UTC (rev 716)
+++ trunk/src/jar/query/java/org/mulgara/server/Session.java	2008-03-27 02:43:41 UTC (rev 717)
@@ -249,7 +249,7 @@
    * @throws QueryException An error was encountered executing the rules.
    * @throws QueryException An error was encountered accessing the rules accross a network.
    */
-  public void applyRules(RulesRef rules) throws QueryException, java.rmi.RemoteException;
+  public void applyRules(RulesRef rules) throws QueryException;
 
   /**
    * Sets whether permanent changes made to the database in this session

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java	2008-03-27 02:26:01 UTC (rev 716)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ApplyRulesOperation.java	2008-03-27 02:43:41 UTC (rev 717)
@@ -19,6 +19,7 @@
 import org.apache.log4j.Logger;
 
 // Local packages
+import org.mulgara.query.QueryException;
 import org.mulgara.resolver.spi.DatabaseMetadata;
 import org.mulgara.resolver.spi.SystemResolver;
 import org.mulgara.rules.Rules;
@@ -47,11 +48,15 @@
    *
    * @param rulesRef A reference to the rules that this operation will execute.
    * @throws IllegalArgumentException if the rules are null.
-   * @throws RemoteException if the rules reference could not be accessed over a network.
+   * @throws QueryException if the rules reference could not be accessed over a network.
    */
-  public ApplyRulesOperation(RulesRef rulesRef) throws RemoteException {
+  public ApplyRulesOperation(RulesRef rulesRef) throws QueryException {
     if (rulesRef == null) throw new IllegalArgumentException("Illegal to use a null set of rules");
-    rules = rulesRef.getRules();
+    try {
+      rules = rulesRef.getRules();
+    } catch (RemoteException e) {
+      throw new QueryException("Unable to read rules from server", e);
+    }
   }
 
   /**

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java	2008-03-27 02:26:01 UTC (rev 716)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java	2008-03-27 02:43:41 UTC (rev 717)
@@ -504,7 +504,7 @@
   /**
    * {@inheritDoc}
    */
-  public void applyRules(RulesRef rulesRef) throws QueryException, java.rmi.RemoteException {
+  public void applyRules(RulesRef rulesRef) throws QueryException {
     execute(new ApplyRulesOperation(rulesRef), "Unable to apply rules");
   }