CWS-TOOLING: integrate CWS dba34a

1 files changed, 4 insertions, 0 deletions

diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index ce1e6db28e99..e8f8f7a41d77 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -26,6 +26,7 @@
  ************************************************************************/
 package complex.dbaccess;
 
+import com.sun.star.container.XNameAccess;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.uno.Exception;
 import com.sun.star.uno.UnoRuntime;
@@ -110,6 +111,9 @@ public class DataSource extends TestCase
             dataSourceName = "someDataSource";
             final XNamingService dataSourceRegistrations = (XNamingService) UnoRuntime.queryInterface(
                     XNamingService.class, getMSF().createInstance("com.sun.star.sdb.DatabaseContext"));
+            final XNameAccess existenceCheck = UnoRuntime.queryInterface( XNameAccess.class, dataSourceRegistrations );
+            if ( existenceCheck.hasByName( "someDataSource" ) )
+                dataSourceRegistrations.revokeObject( "someDataSource" );
             dataSourceRegistrations.registerObject("someDataSource", m_dataSource.getXDataSource());
             assertEquals("registration name of a newly registered data source is wrong", dataSourceName, m_dataSource.getName());
         }