In buildName(), schema should be the empty string, instead of null.

Add some JavaDoc for it, and use getClass().getName() for
getImplementationName(), which is most accurate for Java.

Patch by: me

1 files changed, 7 insertions, 2 deletions

diff --git a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
index cdc9786d9443..b2ab379e685c 100644
--- a/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
+++ b/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/sdbcx/OCatalog.java
@@ -72,7 +72,7 @@ public abstract class OCatalog extends ComponentBase
 
     @Override
     public String getImplementationName() {
-        return "com.sun.star.comp.connectivity.OCatalog";
+        return getClass().getName();
     }
 
     @Override
@@ -128,6 +128,11 @@ public abstract class OCatalog extends ComponentBase
         return users;
     }
 
+    /**
+     * Builds the name which should be used to access the object later on in the collection.
+     * Will only be called in fillNames.
+     * @param  row The current row from the resultset
+     */
     protected String buildName(XRow row) throws SQLException {
         String catalog = row.getString(1);
         if (row.wasNull()) {
@@ -135,7 +140,7 @@ public abstract class OCatalog extends ComponentBase
         }
         String schema = row.getString(2);
         if (row.wasNull()) {
-            schema = null;
+            schema = "";
         }
         String table = row.getString(3);
         if (row.wasNull()) {