Fix to mend debug logging to allow programmatic level setting.

org/postgresql/PGProperty.java

@@ -463,7 +463,7 @@ public void set(Properties properties, int value)
      */
     public boolean isPresent(Properties properties)
     {
-        return get(properties) != null;
+        return getSetString(properties) != null;
     }
 
     /**
@@ -492,4 +492,17 @@ public static PGProperty forName(String name)
         }
         return null;
     }
+    /**
+     * Return the property if exists but avoiding the default. Allowing the caller
+     * to detect the lack of a property. 
+     * @param properties properties bundle
+     * @return the value of a set property
+     */
+    public String getSetString(Properties properties)
+    {
+        Object o = properties.get(_name);
+        if (o instanceof String)
+            return (String) o;
+        return null;
+    }
 }

org/postgresql/jdbc2/AbstractJdbc2Connection.java

@@ -8,7 +8,6 @@
 package org.postgresql.jdbc2;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 import java.sql.*;
 import java.util.*;
 
@@ -122,12 +121,22 @@ protected AbstractJdbc2Connection(HostSpec[] hostSpecs, String user, String data
     {
         this.creatingURL = url;
 
-        // Read loglevel arg and set the loglevel based on this value;
+        // Read loglevel arg and set the loglevel based on this value
+        // otherwise use the programmatic or init logger level;
         // In addition to setting the log level, enable output to
         // standard out if no other printwriter is set
 
         int logLevel = Driver.getLogLevel();
-
+        String connectionLogLevel = PGProperty.LOG_LEVEL.getSetString(info);
+        if (connectionLogLevel != null) {
+            try
+            {
+                logLevel = Integer.parseInt(connectionLogLevel);
+            } catch (NumberFormatException nfe) 
+            {
+                // ignore
+            }
+        }
         synchronized (AbstractJdbc2Connection.class) {
             logger = new Logger(nextConnectionID++);
             logger.setLogLevel(logLevel);

org/postgresql/test/TestUtil.java

@@ -58,6 +58,11 @@ public static String getURL(String server, int port)
 			sendBufferSize = "&sendBufferSize="+getSendBufferSize();
 		}
 
+        String ssl = "";
+        if (getSSL() != null ){
+            ssl = "&ssl="+getSSL();
+        }
+
         return "jdbc:postgresql://"
                                 + server + ":"
                                 + port + "/"
@@ -66,7 +71,8 @@ public static String getURL(String server, int port)
                                 + protocolVersion
                                 + binaryTransfer
 								+ receiveBufferSize
-								+ sendBufferSize;
+								+ sendBufferSize
+								+ ssl;
     }
 
     /*
@@ -161,6 +167,11 @@ public static int getReceiveBufferSize()
 		return Integer.parseInt(System.getProperty("receiveBufferSize","-1"));
 	}
 
+	public static String getSSL()
+	{
+	    return System.getProperty("ssl");
+	}
+
     private static boolean initialized = false;
     public static void initDriver() throws Exception
     {

org/postgresql/test/jdbc2/PGPropertyTest.java

@@ -204,9 +204,13 @@ public void testIsPresentWithParseURLResult() throws Exception
         givenProperties.setProperty("user", TestUtil.getUser());
         givenProperties.setProperty("password", TestUtil.getPassword());
 
+        Properties sysProperties = System.getProperties();
+        sysProperties.remove("ssl");
+        System.setProperties(sysProperties);
         Properties parsedProperties = Driver.parseURL(TestUtil.getURL(), givenProperties);
         Assert.assertFalse("SSL property should not be present", PGProperty.SSL.isPresent(parsedProperties));
 
+        System.setProperty("ssl", "true");
         givenProperties.setProperty("ssl", "true");
         parsedProperties = Driver.parseURL(TestUtil.getURL(), givenProperties);
         Assert.assertTrue("SSL property should be present", PGProperty.SSL.isPresent(parsedProperties));
@@ -218,4 +222,47 @@ public void testIsPresentWithParseURLResult() throws Exception
         parsedProperties = Driver.parseURL(TestUtil.getURL() + "&ssl=true" , null);
         Assert.assertTrue("SSL property should be present", PGProperty.SSL.isPresent(parsedProperties));
     }
+
+    /**
+     * Check whether the isPresent method really works.
+     */
+    public void testPresenceCheck() 
+    {
+        Properties empty = new Properties();
+        Object value = PGProperty.LOG_LEVEL.get(empty);
+        assertNotNull(value);
+        Assert.assertFalse(PGProperty.LOG_LEVEL.isPresent(empty));
+    }
+
+    public void testNullValue() 
+    {
+        Properties empty = new Properties();
+        assertNull(PGProperty.LOG_LEVEL.getSetString(empty));
+        Properties withLogging = new Properties();
+        withLogging.setProperty(PGProperty.LOG_LEVEL.getName(), "2");
+        assertNotNull(PGProperty.LOG_LEVEL.getSetString(withLogging));
+    }
+
+    public void setUp()
+    {
+        bootSSLPropertyValue = System.getProperty("ssl");
+    }
+
+    public void tearDown()
+    {
+        if (bootSSLPropertyValue == null) {
+            System.getProperties().remove("ssl");
+        }
+        else
+        {
+            System.setProperty("ssl", bootSSLPropertyValue);
+        }
+    }
+
+    /**
+     * Some tests modify the "ssl" system property. To not disturb 
+     * other test cases in the suite store the value of the property 
+     * and restore it.
+     */
+    private String bootSSLPropertyValue;
 }