Skip to content

Commit ba78b76

Browse files
committed
Release 3.1.7
- Fixed comparison of Condidate object. This is a critical bugfix for all releases since 3.1.5
2 parents f73ab48 + 65d8663 commit ba78b76

File tree

18 files changed

+57
-17
lines changed

18 files changed

+57
-17
lines changed

perun-auditer-exporter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-auditparser/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-base/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-base/src/main/java/cz/metacentrum/perun/core/api/Candidate.java

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,44 @@ public String toString() {
132132
+ attrNew).append("', additionalUserExtSources='").append(additionalUserExtSources).append("']").toString();
133133
}
134134

135+
@Override
136+
public int hashCode() {
137+
final int prime = 31;
138+
int result = 1;
139+
result = prime * result
140+
+ ((attributes == null) ? 0 : attributes.hashCode());
141+
result = prime * result
142+
+ ((userExtSource == null) ? 0 : userExtSource.hashCode());
143+
return result;
144+
}
145+
146+
@Override
147+
public boolean equals(Object obj) {
148+
if (this == obj) {
149+
return true;
150+
}
151+
if (obj == null) {
152+
return false;
153+
}
154+
if (getClass() != obj.getClass()) {
155+
return false;
156+
}
157+
Candidate other = (Candidate) obj;
158+
if (attributes == null) {
159+
if (other.attributes != null) {
160+
return false;
161+
}
162+
} else if (!attributes.equals(other.attributes)) {
163+
return false;
164+
}
165+
if (userExtSource == null) {
166+
if (other.userExtSource != null) {
167+
return false;
168+
}
169+
} else if (!userExtSource.equals(other.userExtSource)) {
170+
return false;
171+
}
172+
return true;
173+
}
174+
135175
}

perun-cabinet/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-dispatcher/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-engine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

perun-ldapc-initializer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>cz.metacentrum</groupId>
77
<artifactId>perun</artifactId>
8-
<version>3.1.6</version>
8+
<version>3.1.7</version>
99
</parent>
1010

1111
<groupId>cz.metacentrum.perun</groupId>

perun-ldapc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>perun</artifactId>
88
<groupId>cz.metacentrum</groupId>
9-
<version>3.1.6</version>
9+
<version>3.1.7</version>
1010
</parent>
1111

1212
<groupId>cz.metacentrum.perun</groupId>

0 commit comments

Comments
 (0)