[libpostgresql-jdbc-java] 01/24: NPE fix in org.postgresql.Driver.getPropertyInfo #176 \ from Sergey Ignatov

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to tag REL9_3_1103
in repository libpostgresql-jdbc-java.

commit 0eeb4dfd9690a59837884faf0a300b18e98db8dc
Author: Dave Cramer <dave.cramer at credativ.ca>
Date:   Mon Aug 18 12:30:48 2014 +0000

    NPE fix in org.postgresql.Driver.getPropertyInfo #176 \
    from Sergey Ignatov
---
 org/postgresql/Driver.java.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/org/postgresql/Driver.java.in b/org/postgresql/Driver.java.in
index e058be8..96a4be7 100644
--- a/org/postgresql/Driver.java.in
+++ b/org/postgresql/Driver.java.in
@@ -508,7 +508,8 @@ public class Driver implements java.sql.Driver
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException
     {
         Properties copy = new Properties(info);
-        copy = parseURL(url, copy);
+        Properties parse = parseURL(url, copy);
+        if (parse != null) copy = parse;
 
         DriverPropertyInfo[] props = new DriverPropertyInfo[knownProperties.length];
         for (int i = 0; i < knownProperties.length; ++i)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git