Author: kevinshen
Date: 2009-11-19 08:22:52 +0100 (Thu, 19 Nov 2009)
New Revision: 39800
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/version/VersionUtil.java
Log:
CMSC-1586 Showing wrong version in admin dashboard
Modified:
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/version/VersionUtil.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/version/VersionUtil.java
2009-11-18 23:39:14 UTC (rev 39799)
+++
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/java/com/finalist/util/version/VersionUtil.java
2009-11-19 07:22:52 UTC (rev 39800)
@@ -64,13 +64,18 @@
if (start != -1 && end != -1 && end > start) {
// Check if the right version part is found
if (path.charAt(end - 1) >= '0' && path.charAt(end - 1) <= '9') {
- int newEnd = path.lastIndexOf("-", end - 1);
+ if (end-2 >= 0 ) {
+ char secondChar = path.charAt(end - 2);
+ if( (secondChar>= '0' && secondChar <=
'9') || secondChar =='.' || secondChar == '_') {
+ int newEnd = path.lastIndexOf("-",
end - 1);
- // Only use the newEnd if it is still valid. Otherwise
- // 'c3p-1.23.3.jar' fails
- if (newEnd > start) {
- end = newEnd;
- }
+ // Only use the newEnd if it is
still valid. Otherwise
+ // 'c3p-1.23.3.jar' fails
+ if (newEnd > start) {
+ end = newEnd;
+ }
+ }
+ }
}
// TODO Replace this checking for version number by Pattern
matching
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
