From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java b/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java
index 817812c..6243829 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/LicenseFile.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2013 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -140,14 +141,8 @@
*/
static public boolean exists()
{
- if (Utils.isWebStart())
- {
- return false;
- }
- else
- {
- return getFile().exists();
- }
+ // TODO: Try to support License with webstart
+ return !Utils.isWebStart() && getFile().exists();
}
@@ -213,6 +208,7 @@
}
catch (IOException e)
{
+ // do nothing
}
}
}
--
Gitblit v1.10.0