[Mulgara-svn] r2095 - in trunk/src/jar: content-rdfxml/java/org/mulgara/content/rdfxml resolver/java/org/mulgara/resolver server-rmi/java/org/mulgara/server/rmi

[pag at mulgara.org]

Author: pag
Date: 2012-01-10 20:35:22 +0000 (Tue, 10 Jan 2012)
New Revision: 2095

Modified:
   trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/Parser.java
   trunk/src/jar/resolver/java/org/mulgara/resolver/TransitiveFunction.java
   trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswerWrapperAnswer.java
   trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/SessionWrapperRemoteSession.java
Log:
Wrapped logging calls that use string concatenation in tests for the logging level

Modified: trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/Parser.java
===================================================================
--- trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/Parser.java	2012-01-10 20:34:36 UTC (rev 2094)
+++ trunk/src/jar/content-rdfxml/java/org/mulgara/content/rdfxml/Parser.java	2012-01-10 20:35:22 UTC (rev 2095)
@@ -37,6 +37,7 @@
 import javax.activation.MimeType;
 
 // logging
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 
 // JRDF
@@ -374,10 +375,14 @@
    * @param e The exception being handled.
    */
   public synchronized void error(SAXParseException e) {
-    logger.warn("Recoverable error, line " + e.getLineNumber() + ", column " +
-                e.getColumnNumber() + ": " + e.getMessage());
-    logger.debug("Recoverable error, line " + e.getLineNumber() + ", column " +
-        e.getColumnNumber() + ": " + e.getMessage(), e);
+    if (logger.isEnabledFor(Level.WARN)) {
+      logger.warn("Recoverable error, line " + e.getLineNumber() + ", column " +
+                  e.getColumnNumber() + ": " + e.getMessage());
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Recoverable error, line " + e.getLineNumber() + ", column " +
+                   e.getColumnNumber() + ": " + e.getMessage(), e);
+    }
   }
 
   /**
@@ -387,10 +392,15 @@
   public synchronized void fatalError(SAXParseException e)
   {
     exception = e;
-    logger.error("Fatal error, line " + e.getLineNumber() + ", column " +
-                 e.getColumnNumber() + ": " + e.getMessage());
-    logger.debug("Fatal error, line " + e.getLineNumber() + ", column " +
-        e.getColumnNumber() + ": " + e.getMessage(), e);
+    if (logger.isEnabledFor(Level.ERROR)) {
+      logger.error("Fatal error, line " + e.getLineNumber() + ", column " +
+                   e.getColumnNumber() + ": " + e.getMessage());
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Fatal error, line " + e.getLineNumber() + ", column " +
+                   e.getColumnNumber() + ": " + e.getMessage(), e);
+    }
+        
   }
 
   /**
@@ -398,10 +408,14 @@
    * @param e The exception being warned about
    */
   public void warning(SAXParseException e) {
-    logger.warn("Warning, line " + e.getLineNumber() + ", column " +
-                e.getColumnNumber() + ": " + e.getMessage());
-    logger.debug("Warning, line " + e.getLineNumber() + ", column " +
-        e.getColumnNumber() + ": " + e.getMessage(), e);
+    if (logger.isEnabledFor(Level.WARN)) {
+      logger.warn("Warning, line " + e.getLineNumber() + ", column " +
+                  e.getColumnNumber() + ": " + e.getMessage());
+    }
+    if (logger.isDebugEnabled()) {
+      logger.debug("Warning, line " + e.getLineNumber() + ", column " +
+                   e.getColumnNumber() + ": " + e.getMessage(), e);
+    }
   }
 
   //

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/TransitiveFunction.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/TransitiveFunction.java	2012-01-10 20:34:36 UTC (rev 2094)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/TransitiveFunction.java	2012-01-10 20:35:22 UTC (rev 2095)
@@ -125,7 +125,7 @@
         while (given.next()) {
           gs += " " + given.getColumnValue(0);
         }
-        logger.debug("Joined with a given of: " + gs);
+        if (logger.isDebugEnabled()) logger.debug("Joined with a given of: " + gs);
       }
 
       TuplesException te = null;

Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswerWrapperAnswer.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswerWrapperAnswer.java	2012-01-10 20:34:36 UTC (rev 2094)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/RemoteAnswerWrapperAnswer.java	2012-01-10 20:35:22 UTC (rev 2095)
@@ -564,7 +564,7 @@
 
         // log exception and include the stack trace that created this Thread.
         logger.warn("Exception thrown in prefetchThread.");
-        if (caller != null) logger.debug("Prefetch caller: " + caller);
+        if (caller != null && logger.isDebugEnabled()) logger.debug("Prefetch caller: " + caller);
         logger.warn("Caused by", e);
       }
     }

Modified: trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/SessionWrapperRemoteSession.java
===================================================================
--- trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/SessionWrapperRemoteSession.java	2012-01-10 20:34:36 UTC (rev 2094)
+++ trunk/src/jar/server-rmi/java/org/mulgara/server/rmi/SessionWrapperRemoteSession.java	2012-01-10 20:35:22 UTC (rev 2095)
@@ -42,6 +42,7 @@
 
 import javax.activation.MimeType;
 
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jrdf.graph.Triple;
 import org.mulgara.query.Answer;
@@ -577,13 +578,12 @@
   }
 
   public void unreferenced() {
-    if (logger.isDebugEnabled())
-      logger.debug("Closing unreferenced remote session " + session);
+    if (logger.isDebugEnabled()) logger.debug("Closing unreferenced remote session " + session);
 
     try {
       close();
     } catch (Exception e) {
-      logger.warn("Error closing unreferenced session " + session, e);
+      if (logger.isEnabledFor(Level.WARN)) logger.warn("Error closing unreferenced session " + session, e);
     }
   }