You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2017/10/19 10:16:23 UTC
[text] Change order so that all if statements are executed
Repository: commons-text
Updated Branches:
refs/heads/master 8f7d0494d -> b8ab576f3
Change order so that all if statements are executed
Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/b8ab576f
Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/b8ab576f
Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/b8ab576f
Branch: refs/heads/master
Commit: b8ab576f3609af0ba9079dbd6755e901724f1165
Parents: 8f7d049
Author: Bruno P. Kinoshita <br...@yahoo.com.br>
Authored: Thu Oct 19 23:16:10 2017 +1300
Committer: Bruno P. Kinoshita <br...@yahoo.com.br>
Committed: Thu Oct 19 23:16:10 2017 +1300
----------------------------------------------------------------------
.../java/org/apache/commons/text/ExtendedMessageFormat.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-text/blob/b8ab576f/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java b/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
index 6145615..dcf0766 100644
--- a/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
+++ b/src/main/java/org/apache/commons/text/ExtendedMessageFormat.java
@@ -310,9 +310,6 @@ public class ExtendedMessageFormat extends MessageFormat {
if (obj == null) {
return false;
}
- if (!super.equals(obj)) {
- return false;
- }
if (!Objects.equals(getClass(), obj.getClass())) {
return false;
}
@@ -320,6 +317,9 @@ public class ExtendedMessageFormat extends MessageFormat {
if (!Objects.equals(toPattern, rhs.toPattern)) {
return false;
}
+ if (!super.equals(obj)) {
+ return false;
+ }
return Objects.equals(registry, rhs.registry);
}