LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: fixed Bugs in /com/arsdigita/util/Assert.java (FindBugs) 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3516 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
konermann 2015-07-03 08:52:54 +00:00
parent cb54c2c9d9
commit 2302b3928d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-core/src/main/java/com/arsdigita/util/Assert.java
View File

@ -320,8 +320,8 @@ public class Assert {
public static final void isEqual(final Object value1, public static final void isEqual(final Object value1,
final Object value2) { final Object value2) {
if (value1 == null) { if (value1 == null) {
if (value1 != value2) { if (value2 != null) {
final String message = value1 + " does not equal " + value2; final String message = "null does not equal " + value2;
error(message); error(message);
@ -351,7 +351,7 @@ public class Assert {
final Object value2, final Object value2,
final String message) { final String message) {
if (value1 == null) { if (value1 == null) {
if (value1 != value2) { if (value2 != null) {
error(message); error(message);
throw new AssertionError(message); throw new AssertionError(message);
@ -377,8 +377,8 @@ public class Assert {
public static final void isNotEqual(final Object value1, public static final void isNotEqual(final Object value1,
final Object value2) { final Object value2) {
if (value1 == null) { if (value1 == null) {
if (value1 == value2) { if (value2 == null) {
final String message = value1 + " equals " + value2; final String message = "null equals null";
error(message); error(message);
@ -620,9 +620,9 @@ public class Assert {
String actualLabel) { String actualLabel) {
if (isEnabled()) { if (isEnabled()) {
if (expected == null) { if (expected == null) {
isTrue(expected == actual, isTrue(actual == null,
"Values not equal, " + "Values not equal, " +
expectedLabel + " '" + expected + "', " + expectedLabel + " '" + "null" + "', " +
actualLabel + " '" + actual + "'"); actualLabel + " '" + actual + "'");
} else { } else {
isTrue(expected.equals(actual), isTrue(expected.equals(actual),