diff options
| author | Manolo Carrasco <manolo@vaadin.com> | 2014-09-09 17:51:24 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-09-12 17:00:13 +0300 |
| commit | 123813d80f39df8347a95f1e1cb07771f26f5496 (patch) | |
| tree | 17f7da00de65ef6f8aaffacafbc7c23212b103ed /client-compiler | |
| parent | 729448fb19dc318149a4c12d160d50e1f780fd09 (diff) | |
| download | vaadin-framework-123813d80f39df8347a95f1e1cb07771f26f5496.tar.gz vaadin-framework-123813d80f39df8347a95f1e1cb07771f26f5496.zip | |
URI to cval file was wrong in Windows (#14629)
Change-Id: Ifdcf8bcaf6f613660b185501be92eec0b43700b5
Diffstat (limited to 'client-compiler')
| -rw-r--r-- | client-compiler/src/com/vaadin/tools/CvalChecker.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/com/vaadin/tools/CvalChecker.java index e426c5c4e6..3ecb2c432d 100644 --- a/client-compiler/src/com/vaadin/tools/CvalChecker.java +++ b/client-compiler/src/com/vaadin/tools/CvalChecker.java @@ -18,6 +18,7 @@ package com.vaadin.tools; import static java.lang.Integer.parseInt; +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.net.MalformedURLException; @@ -458,12 +459,12 @@ public final class CvalChecker { try { String dotLicenseName = "." + licenseName; - String userHome = "file://" + System.getProperty("user.home") + "/"; - for (URL url : new URL[] { new URL(userHome + dotLicenseName), - new URL(userHome + licenseName), + String userHome = System.getProperty("user.home"); + for (URL url : new URL[] { + new File(userHome, dotLicenseName).toURI().toURL(), + new File(userHome, licenseName).toURI().toURL(), URL.class.getResource("/" + dotLicenseName), URL.class.getResource("/" + licenseName) }) { - if (url != null) { try { key = readKeyFromFile(url, |