1710 Rebase - Second Attempt

[so.git] / mso-catalog-db / src / main / java / org / openecomp / mso / db / catalog / utils / MavenLikeVersioning.java

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioning.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioning.java
index df1a1cb..d557938 100644 (file)
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioning.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/utils/MavenLikeVersioning.java
@@ -51,7 +51,7 @@ public class MavenLikeVersioning implements Serializable {
         *
         */
        public boolean isMoreRecentThan (String versionToCompare) {
-               if (versionToCompare == null || this.version == null) {
+               if (versionToCompare == null || versionToCompare.trim().equals("") || this.version == null || this.version.trim().equals("")) {
                        return false;
                }
                String [] currentVersionArray = this.version.split("\\.");
@@ -87,7 +87,7 @@ public class MavenLikeVersioning implements Serializable {
        public boolean isTheSameVersion (String versionToCompare) {
                if (versionToCompare == null && this.version == null) {
                        return true;
-               } else if (versionToCompare == null || this.version == null) {
+               } else if (versionToCompare == null || versionToCompare.trim().equals("") || this.version == null || this.version.trim().equals("")) {
                        return false;
                }
                String [] currentVersionArray = this.version.split("\\.");