[Mulgara-svn] r2042 - in trunk/src/jar: query/java/org/mulgara/query/operation resolver/java/org/mulgara/resolver resolver-spi/java/org/mulgara/content server/java/org/mulgara/server server-rmi/java/org/mulgara/server/rmi util/java/org/mulgara/util util/java/org/mulgara/util/io
pag at mulgara.org
pag at mulgara.org
Sat Sep 24 01:05:35 UTC 2011
Author: pag
Date: 2011-09-24 01:05:34 +0000 (Sat, 24 Sep 2011)
New Revision: 2042
Modified:
trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java
trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java
trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentResolver.java
trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java
trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java
trunk/src/jar/util/java/org/mulgara/util/Reflect.java
trunk/src/jar/util/java/org/mulgara/util/io/LMappedBufferedFile.java
Log:
More fortify updates, for exception handling
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DataInputTx.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -146,7 +146,9 @@
}
try {
if (remoteInputStream != null) remoteInputStream.close();
- } catch (Exception e) { }
+ } catch (Exception e) {
+ logger.warn("Unable to cleanly close remote data stream", e);
+ }
}
}
Modified: trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java
===================================================================
--- trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/query/java/org/mulgara/query/operation/DataOutputTx.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -134,7 +134,9 @@
if (remoteOutputStream != null) {
try {
remoteOutputStream.close();
- } catch (IOException ioe ) { /* ignore */ }
+ } catch (IOException ioe ) {
+ logger.warn("Unable to cleanly close remote data stream", ioe);
+ }
}
// cleanup the RMI for the output stream
Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransaction.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -274,11 +274,11 @@
private <T extends Throwable> void checkActive(Class<T> exc) throws T {
if (hRollback)
- throw factory.newException(exc, "Transaction was heuristically rolled back. Reason: " + rollbackCause);
+ throw MulgaraTransactionFactory.newException(exc, "Transaction was heuristically rolled back. Reason: " + rollbackCause);
if (rollback)
- throw factory.newException(exc, "Transaction was rolled back. Reason: " + rollbackCause);
+ throw MulgaraTransactionFactory.newException(exc, "Transaction was rolled back. Reason: " + rollbackCause);
if (completed)
- throw factory.newException(exc, "Transaction has been completed");
+ throw MulgaraTransactionFactory.newException(exc, "Transaction has been completed");
}
private <T extends Throwable> void activateXARes(Class<T> exc) throws T {
@@ -322,7 +322,7 @@
xaResState = wasStarted ? ResourceState.SUSPENDED : ResourceState.FINISHED;
- throw factory.newExceptionOrCause(exc, "Error starting resource '" + res + "'", xae);
+ throw MulgaraTransactionFactory.newExceptionOrCause(exc, "Error starting resource '" + res + "'", xae);
}
}
@@ -355,7 +355,7 @@
if (isRollback(xae)) needRollback.add(eres);
if (error == null) {
- error = factory.newExceptionOrCause(exc, "Error ending resource '" + res + "'", xae);
+ error = MulgaraTransactionFactory.newExceptionOrCause(exc, "Error ending resource '" + res + "'", xae);
} else {
logger.error("Error ending resource '" + res + "'", xae);
}
Modified: trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentResolver.java
===================================================================
--- trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentResolver.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/resolver-spi/java/org/mulgara/content/ContentResolver.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -87,7 +87,7 @@
private final Resolver systemResolver;
/** Logger. */
- private static Logger logger = Logger.getLogger(ContentResolver.class.getName());
+ private static final Logger logger = Logger.getLogger(ContentResolver.class.getName());
//
// Constructors
Modified: trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/server/java/org/mulgara/server/EmbeddedMulgaraServer.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -936,7 +936,7 @@
try {
shutdownSocket.close();
} catch (Exception ex) {
- /* skip */
+ log.error("Unexpected problem closing the shutdown socket", ex);
}
}
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/AnswerWrapperRemoteAnswer.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -300,9 +300,9 @@
answer.close();
try {
unexportObject(this, false);
- }
- catch (NoSuchObjectException e) {
+ } catch (NoSuchObjectException e) {
// doesn't matter if this object was not exported, but that shouldn't happen
+ logger.warn("Remote object to be closed was never exported", e);
}
}
Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RmiSessionFactory.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -69,7 +69,7 @@
/**
* Logger.
*/
- Logger logger = Logger.getLogger(RmiSessionFactory.class.getName());
+ private static final Logger logger = Logger.getLogger(RmiSessionFactory.class.getName());
/**
* The RMI stub for the {@link RemoteSessionFactory} wrapping the proxied
Modified: trunk/src/jar/util/java/org/mulgara/util/Reflect.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/Reflect.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/util/java/org/mulgara/util/Reflect.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -66,15 +66,17 @@
// do a standard search
try {
return clazz.getConstructor(argTypes);
- } catch (Exception e) { /* failed - try again */ }
-
- // search for constructors with supertype parameters
- Constructor<T> result = openConstructorSearch(clazz, argTypes, getAssignableTester());
- // search for constructors allowing nulls as parameters
- if (result == null) result = openConstructorSearch(clazz, argTypes, getNullAssignTester());
-
- if (result == null) throw new NoSuchMethodException("Unable to find a method for: " + clazz.getName() + "<init>(" + Arrays.toString(argTypes) + ")");
- return result;
+ } catch (Exception e) {
+ /* failed - try again */
+
+ // search for constructors with supertype parameters
+ Constructor<T> result = openConstructorSearch(clazz, argTypes, getAssignableTester());
+ // search for constructors allowing nulls as parameters
+ if (result == null) result = openConstructorSearch(clazz, argTypes, getNullAssignTester());
+
+ if (result == null) throw new NoSuchMethodException("Unable to find a method for: " + clazz.getName() + "<init>(" + Arrays.toString(argTypes) + ")");
+ return result;
+ }
}
Modified: trunk/src/jar/util/java/org/mulgara/util/io/LMappedBufferedFile.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/io/LMappedBufferedFile.java 2011-09-23 22:11:04 UTC (rev 2041)
+++ trunk/src/jar/util/java/org/mulgara/util/io/LMappedBufferedFile.java 2011-09-24 01:05:34 UTC (rev 2042)
@@ -36,7 +36,9 @@
int tmp = DEFAULT_PAGE_SIZE;
try {
if (pageSizeStr != null) tmp = Integer.parseInt(pageSizeStr);
- } catch (NumberFormatException e) { }
+ } catch (NumberFormatException e) {
+ logger.warn("Property [" + PAGE_SIZE_PROP + "] is not a number [" + pageSizeStr + "]. Using default: " + tmp);
+ }
PAGE_SIZE = tmp;
}
More information about the Mulgara-svn
mailing list