From 3a9aa4c277cbfb956511a1c25e984bb2e2c65476 Mon Sep 17 00:00:00 2001 From: Manolo Carrasco Date: Tue, 9 Sep 2014 17:51:24 +0200 Subject: [PATCH] URI to cval file was wrong in Windows (#14629) Change-Id: Ifdcf8bcaf6f613660b185501be92eec0b43700b5 --- client-compiler/src/com/vaadin/tools/CvalChecker.java | 9 +++++---- 1 file 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 c48aa7d9db..53cbce798e 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; @@ -451,12 +452,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, -- 2.39.5