[aperture-commit] SF.net SVN: aperture:[2325] aperture-webserver/trunk/src/org/ semanticdesktop/aperture/drupalhandler

[<leo...@us...>]

Revision: 2325
          http://aperture.svn.sourceforge.net/aperture/?rev=2325&view=rev
Author:   leo_sauermann
Date:     2010-04-18 22:07:21 +0000 (Sun, 18 Apr 2010)

Log Message:
-----------
aperture-webserver: more logging for null values in parameters.

Modified Paths:
--------------
    aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalCrawlerHandler.java
    aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalXmlRpcService.java

Modified: aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalCrawlerHandler.java
===================================================================
--- aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalCrawlerHandler.java	2010-04-18 20:35:48 UTC (rev 2324)
+++ aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalCrawlerHandler.java	2010-04-18 22:07:21 UTC (rev 2325)
@@ -20,6 +20,7 @@
 import org.semanticdesktop.aperture.accessor.RDFContainerFactory;
 import org.semanticdesktop.aperture.accessor.base.RDFContainerFactoryImpl;
 import org.semanticdesktop.aperture.crawler.Crawler;
+import org.semanticdesktop.aperture.crawler.ExitCode;
 import org.semanticdesktop.aperture.crawler.base.CrawlerHandlerBase;
 import org.semanticdesktop.aperture.mime.identifier.magic.MagicMimeTypeIdentifier;
 import org.semanticdesktop.aperture.rdf.RDFContainer;
@@ -306,6 +307,18 @@
 	}
 
 	@Override
+	public void crawlStarted(Crawler crawler) {
+		super.crawlStarted(crawler);
+		service = null; // reset service
+	}
+
+	@Override
+	public void crawlStopped(Crawler crawler, ExitCode exitCode) {
+		super.crawlStopped(crawler, exitCode);
+		service = null; // reset service
+	}
+
+	@Override
 	public void objectRemoved(Crawler crawler, String url) {
 		// push to drupal
 		try {

Modified: aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalXmlRpcService.java
===================================================================
--- aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalXmlRpcService.java	2010-04-18 20:35:48 UTC (rev 2324)
+++ aperture-webserver/trunk/src/org/semanticdesktop/aperture/drupalhandler/DrupalXmlRpcService.java	2010-04-18 22:07:21 UTC (rev 2325)
@@ -2,12 +2,15 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
+
 import org.apache.xmlrpc.client.XmlRpcClient;
 import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
 import org.apache.xmlrpc.common.XmlRpcExtensionException;
@@ -244,7 +247,7 @@
 		try {
 			o = xmlRpcClient.execute(MethodNodeSave, params);
 		} catch (XmlRpcExtensionException x) {
-			checkNullValue(x, node);
+			checkNullValue(x, node, params);
 			throw x;
 		}
 		if (log.isLoggable(Level.FINEST))
@@ -257,15 +260,25 @@
 	 * In case a NULL value exception was thrown, what caused it?
 	 * @param x
 	 */
-	private void checkNullValue(XmlRpcExtensionException x, DrupalNode node) {
+	private void checkNullValue(XmlRpcExtensionException x, DrupalNode node, List params) {
 		// was it a null value?
 		// stupidity check
-		for (Map.Entry<String, Object> entry : node.entrySet())
-		{
-			if (entry.getValue() == null)
-				log.severe("key "+entry.getKey()+" has a <null> value.");
-		}
+		if (node!=null)
+			for (Map.Entry<String, Object> entry : node.entrySet())
+			{
+				if (entry.getValue() == null)
+					log.severe("key "+entry.getKey()+" has a <null> value.");
+			}
+		if (params!=null)
+			for (int i=0; i<params.size(); i++)
+				if (params.get(i) == null)
+					log.severe("param "+i+" is a <null> value.");
+					
 	}
+	
+	private void checkNullValue(XmlRpcExtensionException x, DrupalNode node) {
+		checkNullValue(x, node, null);
+	}
 
 
 	/**
@@ -281,7 +294,7 @@
 		try {
 			o = xmlRpcClient.execute(MethodExternalDocumentUpdate, params);
 		} catch (XmlRpcExtensionException x) {
-			checkNullValue(x, node);
+			checkNullValue(x, node, params);
 			throw x;
 		}
 		if (log.isLoggable(Level.FINEST))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.