[Mulgara-svn] r2011 - trunk/src/jar/resolver/java/org/mulgara/resolver

[alexhall at mulgara.org]

Author: alexhall
Date: 2011-07-19 21:37:59 +0000 (Tue, 19 Jul 2011)
New Revision: 2011

Modified:
   trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java
Log:
Fix the MBox test - return handler from manager upon successful validation.

Modified: trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java
===================================================================
--- trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java	2011-07-19 20:28:14 UTC (rev 2010)
+++ trunk/src/jar/resolver/java/org/mulgara/resolver/ContentHandlerManagerImpl.java	2011-07-19 21:37:59 UTC (rev 2011)
@@ -64,7 +64,7 @@
 {
   /** Logger.  */
   private static final Logger logger =
-    Logger.getLogger(ContentHandlerManagerImpl.class.getName());
+    Logger.getLogger(ContentHandlerManagerImpl.class);
 
 
   protected List<ContentHandler> contentHandlerList;
@@ -105,8 +105,8 @@
       if (content.getURI() != null) sb.append("<").append(content.getURI()).append("> ");
       if (content.isStreaming()) sb.append("from stream ");
       if (content.getContentType() != null) sb.append("with type ").append(content.getContentType());
-      sb.append(new StackTrace());
       logger.debug(sb.toString());
+      if (logger.isTraceEnabled()) logger.trace("getContentHandler stack trace: " + new StackTrace());
     }
     
     // Prefer supplied MIME type when choosing handler.
@@ -160,9 +160,11 @@
     // This is a hack because the MBox content handler does a blind parse instead of properly
     // checking for content type or file extension.
     if (!content.isStreaming()) {
+      if (logger.isDebugEnabled()) logger.debug("Content is not streaming; checking for validating handlers.");
       for (ContentHandler h : contentHandlerList) {
         if (h instanceof ValidatingContentHandler && ((ValidatingContentHandler)h).validate(content)) {
           if (logger.isDebugEnabled()) logger.debug(h.getClass() + " validated content.");
+          return h;
         }
       }
     }
@@ -178,6 +180,7 @@
     }
     assert defaultHandler != null;
 
+    if (logger.isDebugEnabled()) logger.debug("Could not determine content handler, falling back to default " + defaultHandler.getClass());
     return defaultHandler;
   }