[Mulgara-svn] r2092 - in trunk/src/jar/query/java/org/mulgara/query: . operation

[pag at mulgara.org]

Author: pag
Date: 2012-01-10 20:34:08 +0000 (Tue, 10 Jan 2012)
New Revision: 2092

Modified:
   trunk/src/jar/query/java/org/mulgara/query/ConstraintAssignment.java
   trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java
   trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java
Log:
Added comments and logging to empty catch blocks

Modified: trunk/src/jar/query/java/org/mulgara/query/ConstraintAssignment.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/ConstraintAssignment.java	2012-01-10 16:57:43 UTC (rev 2091)
+++ trunk/src/jar/query/java/org/mulgara/query/ConstraintAssignment.java	2012-01-10 20:34:08 UTC (rev 2092)
@@ -120,7 +120,7 @@
       try {
         v2 = tmpConstraint.expr.getValue();
         exprEq = v1.equals(v2);
-      } catch (QueryException e2) { }
+      } catch (QueryException e2) { /* unbound values are unequal, so continue to return false */ }
     } catch (QueryException e) {
       try {
         v2 = tmpConstraint.expr.getValue();

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java	2012-01-10 16:57:43 UTC (rev 2091)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java	2012-01-10 20:34:08 UTC (rev 2092)
@@ -148,7 +148,7 @@
       if (srv != null) {
         try {
           Rmi.unexportObject(srv, false);
-        } catch (NoSuchObjectException ex) {};
+        } catch (NoSuchObjectException ex) { /* nothing to clean up, so continue */ };
       }
       try {
         if (remoteInputStream != null) remoteInputStream.close();

Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java	2012-01-10 16:57:43 UTC (rev 2091)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java	2012-01-10 20:34:08 UTC (rev 2092)
@@ -143,10 +143,12 @@
       if (srv != null) {
         try {
           Rmi.unexportObject(srv, false);
-        } catch (NoSuchObjectException ex) {};
+        } catch (NoSuchObjectException ex) { /* nothing to clean up, so continue */ };
         try {
           srv.close();
-        } catch (IOException e) {}
+        } catch (IOException e) {
+          logger.warn("Unable to cleanly close data stream to remote object", e);
+        }
       }
     }
   }