Fixed bug when parsing license key

bastillion-io · Apr 9, 2019 · b958a4a · b958a4a
1 parent 9bdd49c
commit b958a4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.bastillion</groupId>
     <artifactId>bastillion</artifactId>
-    <version>3.06.00</version>
+    <version>3.06.01</version>
     <packaging>war</packaging>
     <name>Bastillion</name>
     <properties>

diff --git a/src/main/java/io/bastillion/manage/util/LicenseUtil.java b/src/main/java/io/bastillion/manage/util/LicenseUtil.java
@@ -41,7 +41,8 @@ public static boolean isValid(String license) {
 		String str = EncryptionUtil.decrypt(k, license);
 		if (StringUtils.isNotEmpty(str) && str.contains("@") && str.contains("-")) {
 			try {
-				Date expirationDt = sdf.parse(str.split("-")[1]);
+				int index = str.lastIndexOf("-");
+				Date expirationDt = sdf.parse(str.substring(index + 1));
 				if (expirationDt.before(Calendar.getInstance().getTime())) {
 					return false;
 				}
@@ -65,8 +66,9 @@ public static String getExpirationDt(String license) {
 		String str = EncryptionUtil.decrypt(k, license);
 		if (StringUtils.isNotEmpty(str) && str.contains("@") && str.contains("-")) {
 			try {
-				sdf.parse(str.split("-")[1]);
-				return str.split("-")[1];
+				int index = str.lastIndexOf("-");
+				sdf.parse(str.substring(index + 1));
+				return str.substring(index + 1);
 			} catch (ParseException ex) {
 			}
 		}