diff options
Diffstat (limited to 'libjava/classpath/java/util/Date.java')
| -rw-r--r-- | libjava/classpath/java/util/Date.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libjava/classpath/java/util/Date.java b/libjava/classpath/java/util/Date.java index 5c43bf3c154..f481753db8d 100644 --- a/libjava/classpath/java/util/Date.java +++ b/libjava/classpath/java/util/Date.java @@ -754,6 +754,7 @@ public class Date } else if (firstch >= '0' && firstch <= '9') { + int lastPunct = -1; while (tok != null && tok.length() > 0) { int punctOffset = tok.length(); @@ -791,6 +792,13 @@ public class Date else minute = num; } + else if (lastPunct == ':' && hour >= 0 && (minute < 0 || second < 0)) + { + if (minute < 0) + minute = num; + else + second = num; + } else if ((num >= 70 && (punct == ' ' || punct == ',' || punct == '/' || punct < 0)) @@ -828,6 +836,7 @@ public class Date tok = null; else tok = tok.substring(punctOffset + 1); + lastPunct = punct; } } else if (firstch >= 'A' && firstch <= 'Z') |