From 249dcc4890d220c7aeccb5b905d33da355cd0608 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 05 Jan 2016 13:59:21 +0000
Subject: [PATCH] OPENDJ-2583 Upgrade from 2.5.0 express to 3.0.0 does not work
---
opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java b/opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java
index 1db9c34..e00afaf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/BuildVersion.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013-2015 ForgeRock AS.
+ * Portions copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.util;
@@ -196,14 +196,7 @@
{
if (point == version.point)
{
- if (rev == version.rev)
- {
- return 0;
- }
- else if (rev.compareTo(version.rev) < 0)
- {
- return -1;
- }
+ return 0;
}
else if (point < version.point)
{
@@ -232,7 +225,7 @@
else if (obj instanceof BuildVersion)
{
final BuildVersion other = (BuildVersion) obj;
- return major == other.major && minor == other.minor && point == other.point && rev.equals(other.rev);
+ return major == other.major && minor == other.minor && point == other.point;
}
else
{
@@ -283,12 +276,16 @@
@Override
public int hashCode()
{
- return Arrays.hashCode(new int[] { major, minor, point, rev.hashCode() });
+ return Arrays.hashCode(new int[] { major, minor, point });
}
@Override
public String toString()
{
- return Utils.joinAsString(".", major, minor, point, rev);
+ if (!rev.isEmpty())
+ {
+ return Utils.joinAsString(".", major, minor, point, rev);
+ }
+ return Utils.joinAsString(".", major, minor, point);
}
}
--
Gitblit v1.10.0