From a95ecd8b65ea2275a66f6694f0c09e3faaef4407 Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Thu, 24 Oct 2013 08:30:41 +0200
Subject: fdo#69772 make StringsFromResultSet more robust

Correctly handle case argument _xResultSet == null,
instead of throwing a NullPointerException.

Change-Id: I81e35c77116e2e0302da86f03f7e757a52e97b29
---
 wizards/com/sun/star/wizards/db/DBMetaData.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'wizards')

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index a75009cff511..9e8b98d57548 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -959,6 +959,8 @@ public class DBMetaData
     private String[] StringsFromResultSet(XResultSet _xResultSet, int _icol)
     {
         String[] sColValues = null;
+        if (_xResultSet == null)
+            return sColValues;
         try
         {
             XRow xRow = UnoRuntime.queryInterface( XRow.class, _xResultSet );
-- 
cgit