Changeset 21

Timestamp:

01/22/07 10:38:09 (6 years ago)

Author:

robert

Message:

* made setProxy a bit more tolerant
* slightly changed log messages

Files:

• jala/branches/release-1.0/code/XmlRpcRequest.js (modified) (9 diffs)

jala/branches/release-1.0/code/XmlRpcRequest.js

@@ -73 +73 @@
       if (proxyString && proxyString.trim()) {
          var idx = proxyString.indexOf(":");
-         var host = proxyString.substring(0, idx);
-         var port = proxyString.substring(idx+1);
-         if (java.lang.Class.forName("java.net.Proxy") != null) {
-            // construct a proxy instance
-            var socket = new java.net.InetSocketAddress(host, port);
-            proxy = new java.net.Proxy(java.net.Proxy.Type.HTTP, socket);
-         } else {
-            // the pre jdk1.5 way: set the system properties
-            var sys = java.lang.System.getProperties();
-            if (host) {
-               app.log("[Helma XmlRpc Client] WARNING: setting system http proxy to "
-                       + host + ":" + port);
-               sys.put("http.proxySet", "true");
-               sys.put("http.proxyHost", host);
-               sys.put("http.proxyPort", port);
+         if (idx > 0) {
+            var host = proxyString.substring(0, idx);
+            var port = proxyString.substring(idx+1);
+            if (host != null && port != null) {
+               if (java.lang.Class.forName("java.net.Proxy") != null) {
+                  // construct a proxy instance
+                  var socket = new java.net.InetSocketAddress(host, port);
+                  proxy = new java.net.Proxy(java.net.Proxy.Type.HTTP, socket);
+               } else {
+                  // the pre jdk1.5 way: set the system properties
+                  var sys = java.lang.System.getProperties();
+                  if (host) {
+                     app.log("[Jala XmlRpc Client] WARNING: setting system http proxy to "
+                             + host + ":" + port);
+                     sys.put("http.proxySet", "true");
+                     sys.put("http.proxyHost", host);
+                     sys.put("http.proxyPort", port);
+                  }
+               }
             }
          }
@@ -247 +251 @@
 /** @ignore */
 jala.XmlRpcRequest.prototype.toString = function() {
-   return "[Helma XmlRpc Client]";
+   return "[Jala XmlRpc Request]";
 };
 
@@ -275 +279 @@
    var params = new java.util.Vector();
    for (var i=0;i<arguments.length;i++) {
-      params.add(XmlRpcRequest.convertArgument(arguments[i]));
+      params.add(jala.XmlRpcRequest.convertArgument(arguments[i]));
    }
 
@@ -289 +293 @@
    conn.setAllowUserInteraction(false);
    conn.setRequestMethod("POST");
-   conn.setRequestProperty("User-Agent", "Helma XmlRpc Client");
+   conn.setRequestProperty("User-Agent", "Jala XmlRpc Client");
    conn.setRequestProperty("Content-Type", "text/xml");
    conn.setRequestProperty("Content-Length", requestBytes.length);
@@ -332 +336 @@
             result.error = parsedResult;
          } else {
-            result.result = XmlRpcRequest.convertResult(parsedResult);
+            result.result = jala.XmlRpcRequest.convertResult(parsedResult);
          }
       }
    } catch (e) {
-      result.error = "[Helma XmlRpc Client] Error executing " + this.getMethodName()
-                     + " with arguments " + XmlRpcRequest.argumentsToString(arguments)
+      result.error = "[Jala XmlRpc Request] Error executing " + this.getMethodName()
+                     + " with arguments " + jala.XmlRpcRequest.argumentsToString(arguments)
                      + ", the error is: " + e.toString();
    }
    if (app.__app__.debug() == true) {
-      app.logger.debug("XmlRpcRequest (" + ((new Date()) - start) + " ms): executed '"
+      app.logger.debug("[Jala XmlRpc Request] (" + ((new Date()) - start) + " ms): executed '"
                        + this.getMethodName() + "' with arguments: "
-                       + XmlRpcRequest.argumentsToString(arguments));
+                       + jala.XmlRpcRequest.argumentsToString(arguments));
    }
    return result;
@@ -361 +365 @@
       result = new java.util.Vector(obj.length);
       for (var i=0;i<obj.length;i++) {
-         result.add(i, XmlRpcRequest.convertArgument(obj[i]));
+         result.add(i, jala.XmlRpcRequest.convertArgument(obj[i]));
       }
    } else if (obj instanceof Date) {
@@ -381 +385 @@
       result = new java.util.Hashtable();
       for (var key in obj) {
-         result.put(key, XmlRpcRequest.convertArgument(obj[key]));
+         result.put(key, jala.XmlRpcRequest.convertArgument(obj[key]));
       }
    } else {
@@ -402 +406 @@
       var e = obj.elements();
       while (e.hasMoreElements()) {
-         result.push(XmlRpcRequest.convertResult(e.nextElement()));
+         result.push(jala.XmlRpcRequest.convertResult(e.nextElement()));
       }
    } else if (obj instanceof java.util.Hashtable) {
@@ -411 +415 @@
       while (e.hasMoreElements()) {
          key = e.nextElement();
-         result[key] = XmlRpcRequest.convertResult(obj.get(key));
+         result[key] = jala.XmlRpcRequest.convertResult(obj.get(key));
       }
    } else if (obj instanceof java.lang.String) {