diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 254d074612a..759131293bc 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -244,16 +244,19 @@ IF(CONNECT_WITH_JDBC)
   # Find required libraries and include directories
 
   FIND_PACKAGE(Java)
-	FIND_PACKAGE(JNI)
+  FIND_PACKAGE(JNI)
   IF (JAVA_FOUND AND JNI_FOUND)
+    INCLUDE(UseJava)
     INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH})
     INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH2})
     # SET(JDBC_LIBRARY ${JAVA_JVM_LIBRARY})
-    SET(CONNECT_SOURCES ${CONNECT_SOURCES} 
-		JdbcInterface.java JdbcInterface.class  
-		JdbcDSInterface.java JdbcDSInterface.class  
-		JdbcApacheInterface.java JdbcApacheInterface.class  
-		jdbconn.cpp tabjdbc.cpp jdbconn.h tabjdbc.h jdbccat.h)
+    SET(CONNECT_SOURCES ${CONNECT_SOURCES}
+    JdbcInterface.java JdbcInterface.class
+    JdbcDSInterface.java JdbcDSInterface.class
+    JdbcApacheInterface.java JdbcApacheInterface.class
+    jdbconn.cpp tabjdbc.cpp jdbconn.h tabjdbc.h jdbccat.h)
+    SET (JAVA_SOURCES JdbcInterface.java)
+    add_jar(JdbcInterface ${JAVA_SOURCES})
     add_definitions(-DJDBC_SUPPORT)
   ELSE()
     SET(JDBC_LIBRARY "")
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp
index 9b479277df2..7da433c26cc 100644
--- a/storage/connect/jdbconn.cpp
+++ b/storage/connect/jdbconn.cpp
@@ -270,7 +270,7 @@ PQRYRES JDBCColumns(PGLOBAL g, char *db, char *table, char *colpat,
 		return NULL;
 
 	// Colpat cannot be null or empty for some drivers
-	cap->Pat = (colpat && *colpat) ? colpat : "%";
+	cap->Pat = (colpat && *colpat) ? colpat : PlugDup(g, "%");
 
 	/************************************************************************/
 	/*  Now get the results into blocks.                                    */