Introduced logging bottleneck

1 files changed, 8 insertions, 9 deletions

diff --git a/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java b/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java
index b1c290a..eb4030b 100644
--- a/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java
+++ b/netx/net/sourceforge/jnlp/runtime/RhinoBasedPacEvaluator.java
@@ -49,6 +49,7 @@ import java.security.Permissions;
 import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.util.PropertyPermission;
+import net.sourceforge.jnlp.util.logging.OutputController;
 
 import net.sourceforge.jnlp.util.TimedHashMap;
 
@@ -75,9 +76,7 @@ public class RhinoBasedPacEvaluator implements PacEvaluator {
      * @param pacUrl the url of the PAC file to use
      */
     public RhinoBasedPacEvaluator(URL pacUrl) {
-        if (JNLPRuntime.isDebug()) {
-            System.err.println("Using the Rhino based PAC evaluator for url " + pacUrl);
-        }
+        OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Using the Rhino based PAC evaluator for url " + pacUrl);
         pacHelperFunctionContents = getHelperFunctionContents();
         this.pacUrl = pacUrl;
         pacContents = getPacContents(pacUrl);
@@ -119,7 +118,7 @@ public class RhinoBasedPacEvaluator implements PacEvaluator {
      */
     private String getProxiesWithoutCaching(URL url) {
         if (pacHelperFunctionContents == null) {
-            System.err.println("Error loading pac functions");
+            OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Error loading pac functions");
             return "DIRECT";
         }
 
@@ -151,7 +150,7 @@ public class RhinoBasedPacEvaluator implements PacEvaluator {
             BufferedReader pacReader = new BufferedReader(new InputStreamReader(pacUrl.openStream()));
             try {
                 while ((line = pacReader.readLine()) != null) {
-                    // System.out.println(line);
+                    // OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, line);
                     contents = contents.append(line).append("\n");
                 }
             } finally {
@@ -181,14 +180,14 @@ public class RhinoBasedPacEvaluator implements PacEvaluator {
             try {
                 contents = new StringBuilder();
                 while ((line = pacFuncsReader.readLine()) != null) {
-                    // System.out.println(line);
+                    // OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL,line);
                     contents = contents.append(line).append("\n");
                 }
             } finally {
                 pacFuncsReader.close();
             }
         } catch (IOException e) {
-            e.printStackTrace();
+            OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
             contents = null;
         }
 
@@ -249,7 +248,7 @@ public class RhinoBasedPacEvaluator implements PacEvaluator {
 
                 Object functionObj = scope.get("FindProxyForURL", scope);
                 if (!(functionObj instanceof Function)) {
-                    System.err.println("FindProxyForURL not found");
+                    OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "FindProxyForURL not found");
                     return null;
                 } else {
                     Function findProxyFunction = (Function) functionObj;
@@ -259,7 +258,7 @@ public class RhinoBasedPacEvaluator implements PacEvaluator {
                     return (String) result;
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
                 return "DIRECT";
             } finally {
                 Context.exit();