From: Jani Laakso <jani.laakso@itmill.com>
Date: Fri, 25 May 2007 15:24:43 +0000 (+0000)
Subject: Fixed #747 by removing unneccessary exception because of license has been read,
X-Git-Tag: 6.7.0.beta1~6372
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0d25841033c108a05a7c3fbf126eba5bf0f8da20;p=vaadin-framework.git

Fixed #747 by removing unneccessary exception because of license has been read,
it seems this exception is not required, please review.

Note that ApplicationServlet.checkLicense ensures that license is actually read
for every Servlet instance (Toolkit Application.class).

svn changeset:1499/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/service/License.java b/src/com/itmill/toolkit/service/License.java
index f7de034f36..327368802e 100644
--- a/src/com/itmill/toolkit/service/License.java
+++ b/src/com/itmill/toolkit/service/License.java
@@ -100,15 +100,13 @@ public class License {
 	 *             Error parsing the license file
 	 * @throws IOException
 	 *             Error reading the license file
-	 * @throws LicenseFileHasAlreadyBeenRead
-	 *             License file has already been read.
 	 */
 	public void readLicenseFile(InputStream is) throws SAXException,
-			IOException, LicenseFileHasAlreadyBeenRead {
+			IOException {
 
 		// Once the license has been read, it stays
 		if (hasBeenRead())
-			throw new LicenseFileHasAlreadyBeenRead();
+			return;
 
 		// Parse XML
 		DocumentBuilder db;
@@ -645,7 +643,7 @@ public class License {
 	 *             if the license file has been changed or signature is
 	 *             otherwise invalid.
 	 */
-	private boolean isSignatureValid() throws InvalidLicenseFile,
+	private synchronized boolean isSignatureValid() throws InvalidLicenseFile,
 			LicenseFileHasNotBeenRead, LicenseSignatureIsInvalid {
 
 		if (signatureIsValid)
@@ -698,10 +696,6 @@ public class License {
 		}
 	}
 
-	public class LicenseFileHasAlreadyBeenRead extends Exception {
-		private static final long serialVersionUID = 6531225916088537239L;
-	}
-
 	public class LicenseFileHasNotBeenRead extends Exception {
 		private static final long serialVersionUID = -2298284163422128284L;
 	}