aboutsummaryrefslogtreecommitdiffstats
path: root/client-compiler/src
diff options
context:
space:
mode:
authorTeppo Kurki <teppo.kurki@vaadin.com>2015-06-04 22:02:41 +0300
committerVaadin Code Review <review@vaadin.com>2015-06-05 09:52:33 +0000
commit3ecc805eff05fd8ba905890d0c90c07421d2172b (patch)
tree30c69a6f237aad028569312c278b00261deb55bd /client-compiler/src
parent3deceaa2c18bdf4978edb7978ba95c7c979863bf (diff)
downloadvaadin-framework-3ecc805eff05fd8ba905890d0c90c07421d2172b.tar.gz
vaadin-framework-3ecc805eff05fd8ba905890d0c90c07421d2172b.zip
Fixed CvalChecker invalid version message (#17879)
Change-Id: I2eed6d907be299ebca3e69d7f492aff6f1244fe4
Diffstat (limited to 'client-compiler/src')
-rw-r--r--client-compiler/src/com/vaadin/tools/CvalChecker.java4
1 files changed, 3 insertions, 1 deletions
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"