From 3aadcf8f877a560bed75af7e0db918aa26ef2a03 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 4 Dec 2008 10:00:31 +0000
Subject: Refactoring of infobox implementation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@232 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../java/at/gv/egiz/bku/conf/Configurator.java     | 41 +++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java')

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
index 9ed99190..6078de36 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/conf/Configurator.java
@@ -187,28 +187,29 @@ public abstract class Configurator {
   }
 
   public void configureVersion() {
-    Properties p = new Properties();
-    try {
-      InputStream is = getManifest();
-      if (is != null) {
-        p.load(getManifest());
-        String version = p.getProperty("Implementation-Build");
-        properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
-            "citizen-card-environment/1.2 MOCCA " + version);
-        DataUrl.setConfiguration(properties);
-        log
-            .debug("Setting user agent to: "
-                + properties
-                    .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
-      } else {
-        log.warn("Cannot read manifest");
-        properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
-            "citizen-card-environment/1.2 MOCCA UNKNOWN");
-        DataUrl.setConfiguration(properties);
+    if (properties.getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY) == null) {
+      Properties p = new Properties();
+      try {
+        InputStream is = getManifest();
+        if (is != null) {
+          p.load(getManifest());
+          String version = p.getProperty("Implementation-Build");
+          properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
+              "citizen-card-environment/1.2 MOCCA " + version);
+          log
+              .debug("Setting user agent to: "
+                  + properties
+                      .getProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY));
+        } else {
+          log.warn("Cannot read manifest");
+          properties.setProperty(DataUrlConnection.USER_AGENT_PROPERTY_KEY,
+              "citizen-card-environment/1.2 MOCCA UNKNOWN");
+        }
+      } catch (IOException e) {
+        log.error(e);
       }
-    } catch (IOException e) {
-      log.error(e);
     }
+    DataUrl.setConfiguration(properties);
   }
 
   public void configure() {
-- 
cgit v1.2.3