W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2009

2006/unicorn/src/org/w3c/unicorn UnicornCall.java,1.5,1.6

From: Jean-Guilhem Rouel via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 03 Sep 2009 16:43:23 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MjFP9-0002KP-B8@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn
In directory hutz:/tmp/cvs-serv8804/src/org/w3c/unicorn

Modified Files:
	UnicornCall.java 
Log Message:
Restored ClientHttpRequest as Apache's HttpClient was making the markup validator fail on file upload (in streaming mode) for not much added benefit.
Same goes for EscapeXMLEntities. Not much benefit from using Apache's classes which need several dependencies

Index: UnicornCall.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/UnicornCall.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- UnicornCall.java	2 Sep 2009 15:45:42 -0000	1.5
+++ UnicornCall.java	3 Sep 2009 16:43:21 -0000	1.6
@@ -12,11 +12,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 
 import javax.activation.MimeType;
 import javax.xml.parsers.DocumentBuilder;
@@ -31,7 +29,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.app.event.implement.EscapeXmlReference;
 import org.w3.unicorn.tasklist.GroupType;
 import org.w3c.dom.Document;
 import org.w3c.unicorn.contract.CallParameter;
@@ -55,6 +52,7 @@
 import org.w3c.unicorn.tasklisttree.TLTExec;
 import org.w3c.unicorn.tasklisttree.TLTIf;
 import org.w3c.unicorn.tasklisttree.TLTNode;
+import org.w3c.unicorn.util.EscapeXMLEntities;
 import org.w3c.unicorn.util.Property;
 import org.w3c.unicorn.util.Templates;
 
@@ -606,7 +604,9 @@
 		for (GroupType group : aTask.getOutput().getGroupList()) {
 			if (!group.isSetType()) {
 				for (String observerId : group.getObservationList()) {
-					tempMap.put(observerId, mapOfResponse.get(observerId));
+					if(mapOfResponse.get(observerId) != null) {
+						tempMap.put(observerId, mapOfResponse.get(observerId));
+					}
 				}
 			} else {
 				String type = group.getType().toString();
@@ -902,42 +902,34 @@
 			aResponse = this.aRequest.doRequest();
 		} catch (final Exception e) {
 			RequestThread.logger.error("Exception : " + e.getMessage(), e);
-			e.printStackTrace();
 			try {
 				StringBuilder builder = new StringBuilder();
 				//String lang[] = unicornCall.getMapOfStringParameter().get(
 				//		Property.get("UNICORN_PARAMETER_PREFIX") + "lang");
-				
 				String lang = unicornCall.getLang();
 
 				VelocityContext context = new VelocityContext(Framework.getLanguageContexts().get(lang));
-				
-				final EventCartridge aEventCartridge = new EventCartridge();
-				aEventCartridge.addEventHandler(new EscapeXmlReference());
+				EventCartridge aEventCartridge = new EventCartridge();
+				aEventCartridge.addEventHandler(new EscapeXMLEntities());
 				aEventCartridge.attachToContext(context);
 				
 				if (e.getMessage() != null)	
 					context.put("exception", e.getMessage());
 				else
 					context.put("exception", "");
-
 				ByteArrayOutputStream os = new ByteArrayOutputStream();
 				OutputStreamWriter osw = new OutputStreamWriter(os);
 				Templates.write("io_error.vm", context, osw);
-				
 				osw.close();
-
 				InputStreamReader isr = new InputStreamReader(
 						new ByteArrayInputStream(os.toByteArray()));
-
 				char[] chararray = new char[8192];
 				int readLength = 0;
 				while ((readLength = isr.read(chararray, 0, 8192)) > -1) {
 					builder.append(chararray, 0, readLength);
 				}
-				aResponse = ResponseParserFactory.parse(builder.toString(),
-						this.aRequest.getResponseType());
-				aResponse.setXml(builder);
+				aResponse = ResponseParserFactory.parse(builder.toString(), "default");				
+				aResponse.setXml(builder);				
 			} catch (MalformedURLException e1) {
 				RequestThread.logger
 						.error("Exception : " + e1.getMessage(), e1);
Received on Thursday, 3 September 2009 16:43:35 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:13 GMT