CWS-TOOLING: integrate CWS fs34b_OOO340

2 files changed, 11 insertions, 5 deletions

diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 1facca3d8497..0da7775e7c30 100755
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -59,6 +59,7 @@ public class CopyTableWizard extends CRMBasedTestCase
 {
 
     private DatabaseApplication source;
+    private DbaseDatabase destinationDB = null;
     private DatabaseApplication dest;
 
     public CopyTableWizard()
@@ -73,6 +74,9 @@ public class CopyTableWizard extends CRMBasedTestCase
     public void after()
     {
         dest.store();
+        if ( destinationDB != null )
+            destinationDB.close();
+        destinationDB = null;
         super.after();
     }
 
@@ -83,8 +87,9 @@ public class CopyTableWizard extends CRMBasedTestCase
         try
         {
             createTestCase();
-            source = new DatabaseApplication(this.m_database.getDatabase());
-            dest = new DatabaseApplication(new DbaseDatabase(getMSF()));
+            source = new DatabaseApplication(m_database.getDatabase());
+            destinationDB = new DbaseDatabase( getMSF() );
+            dest = new DatabaseApplication( destinationDB );
         }
         catch (java.lang.Exception ex)
         {
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 8e7c75418875..e5b8a13fb149 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -2191,12 +2191,13 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
         {
             if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent))
             {
-                Reference<XNameAccess> xChild(_xNameAccess->getByName(*pIter),UNO_QUERY);
                 DBTreeListUserData* pEntryData = new DBTreeListUserData;
                 pEntryData->eType = _eEntryType;
-                if ( _eEntryType == etQuery && xChild.is() )
+                if ( _eEntryType == etQuery )
                 {
-                    pEntryData->eType = etQueryContainer;
+                    Reference<XNameAccess> xChild(_xNameAccess->getByName(*pIter),UNO_QUERY);
+                    if ( xChild.is() )
+                        pEntryData->eType = etQueryContainer;
                 }
                 implAppendEntry( _pParent, *pIter, pEntryData, pEntryData->eType );
             }