Repository: james-project Updated Branches: refs/heads/master 34f102990 -> 8f5df4978
JAMES-2525 fixes broken equality introduced in previous commit Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/27ef3356 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/27ef3356 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/27ef3356 Branch: refs/heads/master Commit: 27ef335611e3d162755f4c5ce7237ab3d30a9158 Parents: 34f1029 Author: Jean Helou <j...@codamens.fr> Authored: Fri Oct 5 17:02:42 2018 +0200 Committer: Benoit Tellier <btell...@linagora.com> Committed: Thu Oct 11 09:25:13 2018 +0700 ---------------------------------------------------------------------- .../blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java | 2 +- .../james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/27ef3356/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java ---------------------------------------------------------------------- diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java index 2e1986d..f5e7272 100644 --- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java +++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftKeystone3ObjectStorage.java @@ -209,7 +209,7 @@ public class SwiftKeystone3ObjectStorage { @Override public boolean equals(Object o) { - if (o instanceof SwiftKeystone2ObjectStorage.Configuration) { + if (o instanceof SwiftKeystone3ObjectStorage.Configuration) { Configuration that = (Configuration) o; return Objects.equal(endpoint, that.endpoint) && Objects.equal(identity, that.identity) && http://git-wip-us.apache.org/repos/asf/james-project/blob/27ef3356/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java ---------------------------------------------------------------------- diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java index 48eeeb2..e8f1129 100644 --- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java +++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/swift/SwiftTempAuthObjectStorage.java @@ -195,7 +195,7 @@ public class SwiftTempAuthObjectStorage { @Override public boolean equals(Object o) { - if (o instanceof SwiftKeystone2ObjectStorage.Configuration) { + if (o instanceof SwiftTempAuthObjectStorage.Configuration) { Configuration that = (Configuration) o; return Objects.equal(endpoint, that.endpoint) && Objects.equal(identity, that.identity) && --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
