INTEGRATION: CWS greenstate30ver3_DEV300 (1.1.4.2.20); FILE MERGED

2008/09/03 11:43:20 obr 1.1.4.2.20.1: #i93407# ignore exceptions caused by outdated local service tag client

1 files changed, 10 insertions, 3 deletions

diff --git a/setup_native/source/registration/com/sun/star/registration/Registration.java b/setup_native/source/registration/com/sun/star/registration/Registration.java
index 33637b7ae5f0..afcb1b99660e 100644
--- a/setup_native/source/registration/com/sun/star/registration/Registration.java
+++ b/setup_native/source/registration/com/sun/star/registration/Registration.java
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Registration.java,v $
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -284,8 +284,15 @@ public class Registration {
 
                     // Store the service tag in local registry, which might have been installed later
                     if( Registry.isSupported() ) {
-                        if( Registry.getSystemRegistry().getServiceTag(tag.getInstanceURN()) == null ) {
-                            Registry.getSystemRegistry().addServiceTag(tag);
+                        // ignore communication failures with local service tag client
+                        try {
+                            if( Registry.getSystemRegistry().getServiceTag(tag.getInstanceURN()) == null ) {
+                                Registry.getSystemRegistry().addServiceTag(tag);
+                            }
+                        } catch( java.io.IOException e) {
+                            e.printStackTrace();
+                        } catch (java.lang.RuntimeException e) {
+                            e.printStackTrace();
                         }
                     }
                 }