Changeset 1277:461b8da4b5fc

Timestamp:

06/18/10 21:15:41 (3 years ago)

Author:

Thomas Gambet <tgambet@…>

Branch:

default

Message:

implemented error messages observer_not_found and observer_internal_error

Files:

• src/org/w3c/unicorn/request/UploadRequest.java (modified) (3 diffs)

src/org/w3c/unicorn/request/UploadRequest.java

@@ -4 +4 @@
 package org.w3c.unicorn.request;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.util.Hashtable;
 import java.util.Map;
 
+import org.w3c.unicorn.Framework;
 import org.w3c.unicorn.contract.EnumInputMethod;
 import org.w3c.unicorn.input.UploadInputModule;
@@ -92 +95 @@
         public Response doRequest() throws UnicornException {
                 logger.trace("doRequest");
+                String observerName = Framework.mapOfObserver.get(observerId).getName(sLang.split(",")[0]);
                 try {
                         aClientHttpRequest = new ClientHttpRequest(sURL);
@@ -108 +112 @@
                         }
                         
-                        // TODO How to find the response content encoding here ?
-                        return ResponseFactory.getResponse(aClientHttpRequest.post(), responseType, sURL.toString(), null, observerId);
+                        InputStream stream = null;
+                        try {
+                                stream = aClientHttpRequest.post();
+                                // TODO How to find the response content encoding here ?
+                                return ResponseFactory.getResponse(stream, responseType, sURL.toString(), null, observerId);
+                        } catch (FileNotFoundException e) {
+                                throw new UnicornException(Message.ERROR, "$message_observer_not_found", null, observerName);
+                        } catch (IOException e) {
+                                if (e.getMessage().contains("Server returned HTTP response code: 500"))
+                                        throw new UnicornException(Message.ERROR, "$message_observer_internal_error", null, observerName);
+                                else
+                                        throw e;
+                        }                       
 
                 } catch (MalformedURLException e) {