From 3ecc805eff05fd8ba905890d0c90c07421d2172b Mon Sep 17 00:00:00 2001 From: Teppo Kurki Date: Thu, 4 Jun 2015 22:02:41 +0300 Subject: Fixed CvalChecker invalid version message (#17879) Change-Id: I2eed6d907be299ebca3e69d7f492aff6f1244fe4 --- client-compiler/src/com/vaadin/tools/CvalChecker.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'client-compiler/src') diff --git a/client-compiler/src/com/vaadin/tools/CvalChecker.java b/client-compiler/src/com/vaadin/tools/CvalChecker.java index 645667be94..9217781695 100644 --- a/client-compiler/src/com/vaadin/tools/CvalChecker.java +++ b/client-compiler/src/com/vaadin/tools/CvalChecker.java @@ -243,7 +243,9 @@ public final class CvalChecker { String msg = ""; int majorVers = computeMajorVersion(version); - if (info != null && info.getMessage() != null) { + if (info != null && !info.isValidVersion(majorVers)) { + msg = getErrorMessage("invalid", title, majorVers); + } else if (info != null && info.getMessage() != null) { msg = info.getMessage().replace("\\n", "\n"); } else if (info != null && info.isLicenseExpired()) { String type = "evaluation".equals(info.getType()) ? "Evaluation license" -- cgit v1.2.3