You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/05/03 13:26:15 UTC
svn commit: r399261 -
/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java
Author: antonio
Date: Wed May 3 04:26:09 2006
New Revision: 399261
URL: http://svn.apache.org/viewcvs?rev=399261&view=rev
Log:
Don't check 2 time expression 'cie != null'.
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java?rev=399261&r1=399260&r2=399261&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/rc/RCML.java Wed May 3 04:26:09 2006
@@ -269,16 +269,16 @@
CheckInEntry cie = getLatestCheckInEntry();
CheckOutEntry coe = getLatestCheckOutEntry();
- if (cie != null && coe != null) {
- if (cie.getTime() > coe.getTime()) {
- return cie;
+ if (cie != null) {
+ if (coe != null) {
+ if (cie.getTime() > coe.getTime()) {
+ return cie;
+ } else {
+ return coe;
+ }
} else {
- return coe;
+ return cie;
}
- }
-
- if (cie != null) {
- return cie;
} else {
return coe;
}
@@ -422,7 +422,6 @@
}
}
return (String[]) times.toArray(new String[times.size()]);
-
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org