Fixes exception handling for HTTPGet function.

Author: ckramp

structr-base/src/main/java/org/structr/web/function/HttpGetFunction.java

@@ -25,6 +25,7 @@
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
+import org.structr.common.error.FrameworkException;
 import org.structr.core.GraphObjectMap;
 import org.structr.core.property.*;
 import org.structr.rest.common.HttpHelper;
@@ -56,7 +57,7 @@ public String getSignature() {
 	}
 
 	@Override
-	public Object apply(final ActionContext ctx, final Object caller, final Object[] sources) {
+	public Object apply(final ActionContext ctx, final Object caller, final Object[] sources) throws FrameworkException {
 
 		if (sources != null && sources.length >= 1 && sources.length <= 4 && sources[0] != null) {
 
@@ -159,20 +160,12 @@ public Object apply(final ActionContext ctx, final Object caller, final Object[]
 				}
 
 				return response;
-			} catch (Throwable t) {
+			} catch (IllegalArgumentException e) {
 
-				if (t.getCause() instanceof UnknownHostException) {
-
-					logger.warn("{}", t.getMessage());
-
-				} else {
-
-					logException(caller, t, sources);
-				}
+				logParameterError(caller, sources, e.getMessage(), ctx.isJavaScriptContext());
+				return usage(ctx.isJavaScriptContext());
 			}
-
-			return "";
-
+			
 		} else {
 
 			logParameterError(caller, sources, ctx.isJavaScriptContext());

structr-base/src/main/java/org/structr/web/function/UiFunction.java

@@ -34,17 +34,17 @@
  */
 public abstract class UiFunction extends Function<Object, Object> {
 
-	protected Map<String, Object> getFromUrl(final ActionContext ctx, final String requestUrl, final String charset, final String username, final String password) throws IOException, FrameworkException {
+	protected Map<String, Object> getFromUrl(final ActionContext ctx, final String requestUrl, final String charset, final String username, final String password) throws FrameworkException {
 
 		return HttpHelper.get(requestUrl, charset, username, password, ctx.getHeaders(), ctx.isValidateCertificates());
 	}
 
-	protected Map<String, Object> getBinaryFromUrl(final ActionContext ctx, final String requestUrl, final String charset, final String username, final String password) throws IOException, FrameworkException {
+	protected Map<String, Object> getBinaryFromUrl(final ActionContext ctx, final String requestUrl, final String charset, final String username, final String password) throws FrameworkException {
 
 		return HttpHelper.getBinary(requestUrl, charset, username, password, ctx.getHeaders(), ctx.isValidateCertificates());
 	}
 
-	protected Map<String, Object> headFromUrl(final ActionContext ctx, final String requestUrl, final String username, final String password) throws IOException, FrameworkException {
+	protected Map<String, Object> headFromUrl(final ActionContext ctx, final String requestUrl, final String username, final String password) throws FrameworkException {
 
 		return HttpHelper.head(requestUrl, password, username, ctx.getHeaders(), ctx.isValidateCertificates());
 	}