[Mulgara-svn] r1418 - trunk/src/jar/server-rmi/java/org/mulgara/server/rmi

[pag at mulgara.org]

Author: pag
Date: 2008-12-16 01:03:01 -0800 (Tue, 16 Dec 2008)
New Revision: 1418

Modified:
   trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
Log:
Correctly reporting rule exceptions which were never reported correctly. Also removed an unneeded warning suppression

Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java	2008-12-15 04:05:22 UTC (rev 1417)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteSessionWrapperSession.java	2008-12-16 09:03:01 UTC (rev 1418)
@@ -507,7 +507,6 @@
   /**
    * {@inheritDoc}
    */
-  @SuppressWarnings("unchecked")
   public List<Answer> query(List<Query> queries) throws QueryException {
 
     try {
@@ -699,10 +698,12 @@
   public RulesRef buildRules(URI ruleModel, URI baseModel, URI destModel) throws QueryException, org.mulgara.rules.InitializerException {
     try {
       RulesRef ref = remoteSession.buildRules(ruleModel, baseModel, destModel);
-      logger.info("got rules from RMI");
+      if (logger.isDebugEnabled()) logger.debug("got rules from RMI");
       return ref;
     } catch (RemoteException re) {
-      throw new org.mulgara.rules.InitializerException("Java RMI reconnection failure", re);
+      Throwable cause = re.getCause();
+      if (cause != null) throw new org.mulgara.rules.InitializerException("Unable to load rules: " + cause.getMessage(), cause);
+      throw new org.mulgara.rules.InitializerException("Unable to load rules", re);
     }
   }
 
@@ -714,7 +715,9 @@
     try {
       remoteSession.applyRules(rules);
     } catch (RemoteException re) {
-      throw new QueryException("Java RMI reconnection failure", re);
+      Throwable cause = re.getCause();
+      if (cause != null) throw new QueryException("Error applying rules: " + cause.getMessage(), cause);
+      throw new QueryException("Error applying rules", re);
     }
   }